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 8ECFB1088C for ; Tue, 26 Nov 2013 21:06:02 +0000 (UTC) Received: (qmail 23183 invoked by uid 500); 26 Nov 2013 21:06:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 23115 invoked by uid 500); 26 Nov 2013 21:06:01 -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 23049 invoked by uid 99); 26 Nov 2013 21:06:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Nov 2013 21:06:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7023691904C; Tue, 26 Nov 2013 21:06:01 +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: Tue, 26 Nov 2013 21:06:06 -0000 Message-Id: In-Reply-To: <4f632ecc036c40a8a8be784940cf308f@git.apache.org> References: <4f632ecc036c40a8a8be784940cf308f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/54f737f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/54f737f2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/54f737f2 Branch: refs/heads/master Commit: 54f737f2e6259fa424be9d3aa4245956ebea30cd Parents: f460013 f8e14c7 Author: Eric Newton Authored: Tue Nov 26 15:08:40 2013 -0500 Committer: Eric Newton Committed: Tue Nov 26 15:08:40 2013 -0500 ---------------------------------------------------------------------- .../core/client/mapreduce/RangeInputSplit.java | 81 ++++++++++---------- .../mapreduce/AccumuloInputFormatTest.java | 18 +++-- .../accumulo/test/functional/ExamplesIT.java | 27 ++++--- 3 files changed, 70 insertions(+), 56 deletions(-) ----------------------------------------------------------------------