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 916B4C92B for ; Tue, 9 Dec 2014 02:51:15 +0000 (UTC) Received: (qmail 16632 invoked by uid 500); 9 Dec 2014 02:51:15 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 16528 invoked by uid 500); 9 Dec 2014 02:51:15 -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 16441 invoked by uid 99); 9 Dec 2014 02:51:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 02:51:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1D5FDA1F326; Tue, 9 Dec 2014 02:51:15 +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: Tue, 09 Dec 2014 02:51:17 -0000 Message-Id: <082e4176d3e14cb28039f92fc3738b4f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.6' Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab4cc79a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab4cc79a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab4cc79a Branch: refs/heads/master Commit: ab4cc79accd1974289cd3c67873709fe345efef7 Parents: 0f2bd37 6170c02 Author: Josh Elser Authored: Mon Dec 8 21:50:50 2014 -0500 Committer: Josh Elser Committed: Mon Dec 8 21:50:50 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab4cc79a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------