Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6F239113FB for ; Wed, 17 Sep 2014 15:19:59 +0000 (UTC) Received: (qmail 79860 invoked by uid 500); 17 Sep 2014 15:19:59 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 79758 invoked by uid 500); 17 Sep 2014 15:19:59 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 79585 invoked by uid 99); 17 Sep 2014 15:19:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 15:19:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 099C6A18925; Wed, 17 Sep 2014 15:19:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Wed, 17 Sep 2014 15:20:01 -0000 Message-Id: <5812de7034064f2a8e74168cee226eb6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/5] git commit: Merge remote branch 'origin/1.6.1-SNAPSHOT' into 1.6.1-SNAPSHOT Merge remote branch 'origin/1.6.1-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bd5d438 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bd5d438 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bd5d438 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 0bd5d438578f45e66eaa0dcd7cfb81f8693841ee Parents: 597b787 3e4d07b Author: Eric C. Newton Authored: Wed Sep 17 11:18:37 2014 -0400 Committer: Eric C. Newton Committed: Wed Sep 17 11:18:37 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/test/Accumulo3030IT.java | 27 +++++++++++++++----- .../test/functional/AccumuloInputFormatIT.java | 21 +++++++++++++-- 2 files changed, 40 insertions(+), 8 deletions(-) ----------------------------------------------------------------------