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 8E18610F17 for ; Thu, 20 Mar 2014 21:49:33 +0000 (UTC) Received: (qmail 3071 invoked by uid 500); 20 Mar 2014 21:49:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 2984 invoked by uid 500); 20 Mar 2014 21:49:20 -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 2887 invoked by uid 99); 20 Mar 2014 21:49:18 -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, 20 Mar 2014 21:49:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 406A2986FBD; Thu, 20 Mar 2014 21:49:18 +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: Thu, 20 Mar 2014 21:49:27 -0000 Message-Id: In-Reply-To: <7390119c75424ace9407a144253172e5@git.apache.org> References: <7390119c75424ace9407a144253172e5@git.apache.org> 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/394fe061 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/394fe061 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/394fe061 Branch: refs/heads/master Commit: 394fe061fb896e740b0932a9736c0fcc16caee95 Parents: b644eda 44b13c1 Author: Josh Elser Authored: Thu Mar 20 17:48:57 2014 -0400 Committer: Josh Elser Committed: Thu Mar 20 17:48:57 2014 -0400 ---------------------------------------------------------------------- .../minicluster/impl/MiniAccumuloClusterImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/394fe061/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------