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 89BC31175F for ; Mon, 16 Jun 2014 13:32:32 +0000 (UTC) Received: (qmail 51664 invoked by uid 500); 16 Jun 2014 13:32:32 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 51585 invoked by uid 500); 16 Jun 2014 13:32:32 -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 51458 invoked by uid 99); 16 Jun 2014 13:32:32 -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, 16 Jun 2014 13:32:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F0F8E9402B2; Mon, 16 Jun 2014 13:32:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhavanki@apache.org To: commits@accumulo.apache.org Date: Mon, 16 Jun 2014 13:32:32 -0000 Message-Id: <09298c15ce514e15ba78b2254c7f4e46@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: ACCUMULO-2906 configuredZookeeperPort is not cased the same way as other mentions of ZooKeeper ACCUMULO-2906 configuredZookeeperPort is not cased the same way as other mentions of ZooKeeper Signed-off-by: Bill Havanki Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b604e1d0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b604e1d0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b604e1d0 Branch: refs/heads/master Commit: b604e1d0fe376d780e843550643970c35437d5b3 Parents: 4693106 Author: David S. Wang Authored: Fri Jun 13 12:46:02 2014 -0700 Committer: Bill Havanki Committed: Mon Jun 16 09:26:54 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/minicluster/MiniAccumuloConfig.java | 2 +- .../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b604e1d0/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java index 980097e..be80f85 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java @@ -165,7 +165,7 @@ public class MiniAccumuloConfig { * @since 1.6.0 */ public int getZooKeeperPort() { - return impl.getConfiguredZookeeperPort(); + return impl.getConfiguredZooKeeperPort(); } /** http://git-wip-us.apache.org/repos/asf/accumulo/blob/b604e1d0/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java index 49773f9..337eda0 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java @@ -56,7 +56,7 @@ public class MiniAccumuloConfigImpl implements AccumuloConfig { private File walogDir; private int zooKeeperPort = 0; - private int configuredZookeeperPort = 0; + private int configuredZooKeeperPort = 0; private long zooKeeperStartupTime = 20*1000; private long defaultMemorySize = 128 * 1024 * 1024; @@ -207,7 +207,7 @@ public class MiniAccumuloConfigImpl implements AccumuloConfig { */ @Override public MiniAccumuloConfigImpl setZooKeeperPort(int zooKeeperPort) { - this.configuredZookeeperPort = zooKeeperPort; + this.configuredZooKeeperPort = zooKeeperPort; this.zooKeeperPort = zooKeeperPort; return this; } @@ -295,8 +295,8 @@ public class MiniAccumuloConfigImpl implements AccumuloConfig { return zooKeeperPort; } - public int getConfiguredZookeeperPort() { - return configuredZookeeperPort; + public int getConfiguredZooKeeperPort() { + return configuredZooKeeperPort; } public long getZooKeeperStartupTime() {