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 406F41110C for ; Sat, 14 Jun 2014 04:35:44 +0000 (UTC) Received: (qmail 24106 invoked by uid 500); 14 Jun 2014 04:35:43 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 24072 invoked by uid 500); 14 Jun 2014 04:35: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 23958 invoked by uid 99); 14 Jun 2014 04:35:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jun 2014 04:35:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8ECA193486F; Sat, 14 Jun 2014 04:35:43 +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: Sat, 14 Jun 2014 04:35:53 -0000 Message-Id: <2f943d289268447dbffa65f847b64718@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/50] [abbrv] git commit: Merge branch '1.6.1-SNAPSHOT' Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97cac218 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97cac218 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97cac218 Branch: refs/heads/ACCUMULO-378 Commit: 97cac218c388af359d51544493a0580be0252a8b Parents: 9fcaace 1b170e8 Author: Mike Drob Authored: Wed Jun 11 11:52:48 2014 -0400 Committer: Mike Drob Committed: Wed Jun 11 11:52:48 2014 -0400 ---------------------------------------------------------------------- bin/config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------