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 C8F6418244 for ; Tue, 12 May 2015 17:07:32 +0000 (UTC) Received: (qmail 52599 invoked by uid 500); 12 May 2015 17:07:32 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 52565 invoked by uid 500); 12 May 2015 17:07:32 -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 52556 invoked by uid 99); 12 May 2015 17:07:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 17:07:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 684CCE0B3F; Tue, 12 May 2015 17:07:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Tue, 12 May 2015 17:07:33 -0000 Message-Id: <5b2edb3bba4846559a2366b6b7670bfc@git.apache.org> In-Reply-To: <7ea98c76b4e64b32b3b23ec6dec5543e@git.apache.org> References: <7ea98c76b4e64b32b3b23ec6dec5543e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d353b616 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d353b616 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d353b616 Branch: refs/heads/master Commit: d353b61682dab0fa10e4ee1d8c96170e57844792 Parents: e2e5afb 4362929 Author: Keith Turner Authored: Tue May 12 12:56:40 2015 -0400 Committer: Keith Turner Committed: Tue May 12 12:56:40 2015 -0400 ---------------------------------------------------------------------- .../mapreduce/lib/util/ConfiguratorBase.java | 277 +++++++++++ .../lib/util/FileOutputConfigurator.java | 170 +++++++ .../mapreduce/lib/util/InputConfigurator.java | 462 +++++++++++++++++++ .../mapreduce/lib/util/OutputConfigurator.java | 196 ++++++++ .../client/mapreduce/lib/util/package-info.java | 22 + 5 files changed, 1127 insertions(+) ----------------------------------------------------------------------