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 5C57C10160 for ; Thu, 7 Nov 2013 18:51:42 +0000 (UTC) Received: (qmail 71963 invoked by uid 500); 7 Nov 2013 18:51:42 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 71887 invoked by uid 500); 7 Nov 2013 18:51:42 -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 71692 invoked by uid 99); 7 Nov 2013 18:51:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Nov 2013 18:51:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A6FAF31D472; Thu, 7 Nov 2013 18:51:41 +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: Thu, 07 Nov 2013 18:51:54 -0000 Message-Id: In-Reply-To: <2fb49b00c96640adabdb578ec20da0fe@git.apache.org> References: <2fb49b00c96640adabdb578ec20da0fe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/14] 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/ddde450b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ddde450b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ddde450b Branch: refs/heads/master Commit: ddde450b9b065fdf34bf0f1c775eeac409e1015a Parents: 0a0ab32 81861db Author: Eric Newton Authored: Thu Nov 7 13:51:53 2013 -0500 Committer: Eric Newton Committed: Thu Nov 7 13:51:53 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------