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 C480B1112A for ; Sat, 14 Jun 2014 04:35:47 +0000 (UTC) Received: (qmail 26295 invoked by uid 500); 14 Jun 2014 04:35:47 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 26265 invoked by uid 500); 14 Jun 2014 04:35:47 -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 26186 invoked by uid 99); 14 Jun 2014 04:35:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jun 2014 04:35:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8E38F9348BA; Sat, 14 Jun 2014 04:35:47 +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: Sat, 14 Jun 2014 04:36:25 -0000 Message-Id: <31bdcd66106040bbada5ef8286ddecaa@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/50] [abbrv] git commit: Merge branch '1.6.1-SNAPSHOT' Merge branch '1.6.1-SNAPSHOT' Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/668c9e3a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/668c9e3a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/668c9e3a Branch: refs/heads/ACCUMULO-378 Commit: 668c9e3a8d556d362508fa98b09834fc4689fbe1 Parents: 7efff51 8b2f2dc Author: Bill Havanki Authored: Fri Jun 13 09:40:15 2014 -0400 Committer: Bill Havanki Committed: Fri Jun 13 09:40:15 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/cluster/AccumuloConfig.java | 11 +++++++++++ .../minicluster/MiniAccumuloConfig.java | 14 ++++++++++++++ .../minicluster/MiniAccumuloRunner.java | 4 ++++ .../impl/MiniAccumuloClusterImpl.java | 7 ++----- .../impl/MiniAccumuloConfigImpl.java | 20 ++++++++++++++++++++ .../impl/MiniAccumuloConfigImplTest.java | 8 ++++++++ 6 files changed, 59 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/668c9e3a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/668c9e3a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------