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 F27F610182 for ; Wed, 4 Dec 2013 20:46:30 +0000 (UTC) Received: (qmail 23463 invoked by uid 500); 4 Dec 2013 20:46:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 23416 invoked by uid 500); 4 Dec 2013 20:46: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 23324 invoked by uid 99); 4 Dec 2013 20:46:30 -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, 04 Dec 2013 20:46:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A0D8FBD2A; Wed, 4 Dec 2013 20:46:30 +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: Wed, 04 Dec 2013 20:46:32 -0000 Message-Id: In-Reply-To: <82fd40945d604046a7c604a0990cf6fd@git.apache.org> References: <82fd40945d604046a7c604a0990cf6fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 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/4deaf92e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4deaf92e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4deaf92e Branch: refs/heads/1.6.0-SNAPSHOT Commit: 4deaf92e51084c1216c1d188a6f91c9bc0ba269e Parents: 13759ef cbb4219 Author: Keith Turner Authored: Wed Dec 4 15:44:51 2013 -0500 Committer: Keith Turner Committed: Wed Dec 4 15:44:51 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4deaf92e/bin/config.sh ----------------------------------------------------------------------