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 4A5721137F for ; Mon, 4 Aug 2014 15:50:59 +0000 (UTC) Received: (qmail 19008 invoked by uid 500); 4 Aug 2014 15:50:59 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 18901 invoked by uid 500); 4 Aug 2014 15:50:59 -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 18881 invoked by uid 99); 4 Aug 2014 15:50:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Aug 2014 15:50:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CD528889C8A; Mon, 4 Aug 2014 15:50:58 +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: Mon, 04 Aug 2014 15:51:00 -0000 Message-Id: <5fed954a5cc0423a838c907526139c3d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/118184bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/118184bc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/118184bc Branch: refs/heads/master Commit: 118184bc31007a49e956d54596d862b986334e20 Parents: f34f1d8 e2dc550 Author: Josh Elser Authored: Mon Aug 4 11:50:45 2014 -0400 Committer: Josh Elser Committed: Mon Aug 4 11:50:45 2014 -0400 ---------------------------------------------------------------------- .../minicluster/impl/MiniAccumuloClusterImplTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------