Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 469310606 -> b604e1d0f refs/heads/master e5c785413 -> da242bc1a
ACCUMULO-2906 configuredZookeeperPort is not cased the same way as other mentions of ZooKeeper Signed-off-by: Bill Havanki <bhava...@cloudera.com> 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/1.6.1-SNAPSHOT Commit: b604e1d0fe376d780e843550643970c35437d5b3 Parents: 4693106 Author: David S. Wang <d...@cloudera.com> Authored: Fri Jun 13 12:46:02 2014 -0700 Committer: Bill Havanki <bhava...@cloudera.com> 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() {
