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 C4165108CE for ; Sun, 24 Nov 2013 00:33:34 +0000 (UTC) Received: (qmail 92795 invoked by uid 500); 24 Nov 2013 00:33:33 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 92642 invoked by uid 500); 24 Nov 2013 00:33:33 -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 92549 invoked by uid 99); 24 Nov 2013 00:33:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Nov 2013 00:33:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 878B3904048; Sun, 24 Nov 2013 00:33:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sun, 24 Nov 2013 00:33:40 -0000 Message-Id: <23e52f9c1a00493eae556d2afba1c4ca@git.apache.org> In-Reply-To: <449e651f9ade4e8fa564570029299af0@git.apache.org> References: <449e651f9ade4e8fa564570029299af0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/31] git commit: Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge Conflicts: src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4dfe3e01 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4dfe3e01 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4dfe3e01 Branch: refs/heads/master Commit: 4dfe3e01719696c483d65d62a42be11cb067746a Parents: 16a2e0f 3beb9f7 Author: Josh Elser Authored: Thu Nov 21 20:20:02 2013 -0500 Committer: Josh Elser Committed: Thu Nov 21 20:20:02 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------