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 899211012E for ; Wed, 8 Jan 2014 05:08:00 +0000 (UTC) Received: (qmail 7470 invoked by uid 500); 8 Jan 2014 05:07:50 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 7440 invoked by uid 500); 8 Jan 2014 05:07:43 -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 7401 invoked by uid 99); 8 Jan 2014 05:07:39 -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, 08 Jan 2014 05:07:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 97B113A8AB; Wed, 8 Jan 2014 05:07:39 +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: Wed, 08 Jan 2014 05:07:41 -0000 Message-Id: In-Reply-To: <0ba95160ac044cd09ba8cdf5e0af4f66@git.apache.org> References: <0ba95160ac044cd09ba8cdf5e0af4f66@git.apache.org> 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/1c7159e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c7159e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c7159e5 Branch: refs/heads/master Commit: 1c7159e5b27db717382ce6191583b61d0ae1547a Parents: 5724ac9 472f484 Author: Josh Elser Authored: Wed Jan 8 00:05:44 2014 -0500 Committer: Josh Elser Committed: Wed Jan 8 00:05:44 2014 -0500 ---------------------------------------------------------------------- bin/accumulo | 11 +++++++++++ bin/config.sh | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+) ----------------------------------------------------------------------