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 A55E711BD3 for ; Fri, 11 Jul 2014 17:31:05 +0000 (UTC) Received: (qmail 3641 invoked by uid 500); 11 Jul 2014 17:31:05 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 3615 invoked by uid 500); 11 Jul 2014 17:31:05 -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 3602 invoked by uid 99); 11 Jul 2014 17:31:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jul 2014 17:31:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2ABE283C778; Fri, 11 Jul 2014 17:31:05 +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: Fri, 11 Jul 2014 17:31:10 -0000 Message-Id: <03f4db9b7be14704b94e511fe585d448@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/ab037802 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab037802 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab037802 Branch: refs/heads/master Commit: ab0378024c511795dfa971d201277c337d42d697 Parents: d40c887 ea78c28 Author: Josh Elser Authored: Fri Jul 11 13:16:47 2014 -0400 Committer: Josh Elser Committed: Fri Jul 11 13:16:47 2014 -0400 ---------------------------------------------------------------------- .../impl/MiniAccumuloClusterImpl.java | 25 +++++++- .../minicluster/impl/CleanShutdownMacTest.java | 61 ++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab037802/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------