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 2866D1085A for ; Wed, 22 Jan 2014 19:03:38 +0000 (UTC) Received: (qmail 3889 invoked by uid 500); 22 Jan 2014 19:03:34 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 3689 invoked by uid 500); 22 Jan 2014 19:03:30 -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 3616 invoked by uid 99); 22 Jan 2014 19:03:28 -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, 22 Jan 2014 19:03:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 62EBA8A0333; Wed, 22 Jan 2014 19:03:28 +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, 22 Jan 2014 19:03:30 -0000 Message-Id: <04ae694f8b6b441e82040927c7f94898@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '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/5b4ec334 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b4ec334 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b4ec334 Branch: refs/heads/master Commit: 5b4ec3343c8a13db152e9b7bd2783b89357d4170 Parents: 04f4854 99ebfc7 Author: Eric Newton Authored: Wed Jan 22 14:03:16 2014 -0500 Committer: Eric Newton Committed: Wed Jan 22 14:03:16 2014 -0500 ---------------------------------------------------------------------- .../mapreduce/lib/util/InputConfigurator.java | 11 +++++++++-- .../client/mapreduce/AccumuloInputFormatTest.java | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) ----------------------------------------------------------------------