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 F0C7010FA6 for ; Thu, 27 Mar 2014 05:07:21 +0000 (UTC) Received: (qmail 30602 invoked by uid 500); 27 Mar 2014 05:07:18 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 30403 invoked by uid 500); 27 Mar 2014 05:07:14 -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 30050 invoked by uid 99); 27 Mar 2014 05:07:01 -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, 27 Mar 2014 05:07:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2A8C983724C; Thu, 27 Mar 2014 05:07:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Thu, 27 Mar 2014 05:07:09 -0000 Message-Id: <63b5a415ae344c69aee81922f1df0a8e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] 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/be9cd71c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be9cd71c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/be9cd71c Branch: refs/heads/master Commit: be9cd71c28fc51fb131ff6cbcab306b4d1c4dc8c Parents: abb545f a5a0552 Author: Sean Busbey Authored: Thu Mar 27 00:05:38 2014 -0500 Committer: Sean Busbey Committed: Thu Mar 27 00:05:38 2014 -0500 ---------------------------------------------------------------------- start/src/main/java/org/apache/accumulo/start/Main.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ----------------------------------------------------------------------