You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/04/29 05:27:03 UTC
[1/3] git commit: ACCUMULO-2752 Adding accidentally omitted
getZooKeeperPort method
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 1f7dd2d53 -> f5bcee7ae
refs/heads/master b48b13acb -> fb7534b4d
ACCUMULO-2752 Adding accidentally omitted getZooKeeperPort method
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5bcee7a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5bcee7a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f5bcee7a
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f5bcee7aeb2d94125324fb14892855fbd6c64473
Parents: 1f7dd2d
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 28 23:12:30 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 28 23:24:57 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/cluster/AccumuloConfig.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5bcee7a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
index 8138615..eb373c7 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
@@ -91,6 +91,11 @@ public interface AccumuloConfig {
public Map<String,String> getSiteConfig();
/**
+ * @return The configured ZooKeeper port
+ */
+ public int getZooKeeperPort();
+
+ /**
* @return name of configured instance
*/
public String getInstanceName();
[2/3] git commit: ACCUMULO-2752 Adding accidentally omitted
getZooKeeperPort method
Posted by el...@apache.org.
ACCUMULO-2752 Adding accidentally omitted getZooKeeperPort method
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5bcee7a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5bcee7a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f5bcee7a
Branch: refs/heads/master
Commit: f5bcee7aeb2d94125324fb14892855fbd6c64473
Parents: 1f7dd2d
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 28 23:12:30 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 28 23:24:57 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/cluster/AccumuloConfig.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5bcee7a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
index 8138615..eb373c7 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
@@ -91,6 +91,11 @@ public interface AccumuloConfig {
public Map<String,String> getSiteConfig();
/**
+ * @return The configured ZooKeeper port
+ */
+ public int getZooKeeperPort();
+
+ /**
* @return name of configured instance
*/
public String getInstanceName();
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb7534b4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb7534b4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb7534b4
Branch: refs/heads/master
Commit: fb7534b4dd40071ebe49ed992e22cb8f00aa0460
Parents: b48b13a f5bcee7
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 28 23:25:12 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 28 23:25:12 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/cluster/AccumuloConfig.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------