svn commit: r1422473 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java

[ph...@apache.org]

Author: phunt
Date: Sun Dec 16 06:43:03 2012
New Revision: 1422473

URL: http://svn.apache.org/viewvc?rev=1422473&view=rev
Log:
ZOOKEEPER-1602. a change to QuorumPeerConfig's API broke compatibility with HBase (Alexander Shraer via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1422473&r1=1422472&r2=1422473&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun Dec 16 06:43:03 2012
@@ -437,6 +437,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1584. Adding mvn-install target for deploying the
   zookeeper artifacts to .m2 repository (Ashish Singh via phunt)
 
+  ZOOKEEPER-1602. a change to QuorumPeerConfig's API broke
+  compatibility with HBase (Alexander Shraer via phunt)
+
 Release 3.4.0 - 
 
 Non-backward compatible changes:

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java?rev=1422473&r1=1422472&r2=1422473&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java Sun Dec 16 06:43:03 2012
@@ -28,6 +28,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.Collections;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Map.Entry;
 
@@ -488,6 +490,11 @@ public class QuorumPeerConfig {
         return quorumVerifier;
     }
 
+    public Map<Long,QuorumServer> getServers() {
+        // returns all configuration servers -- participants and observers
+        return Collections.unmodifiableMap(quorumVerifier.getAllMembers());
+    }
+
     public long getServerId() { return serverId; }
 
     public boolean isDistributed() { return (quorumVerifier!=null && quorumVerifier.getVotingMembers().size() > 1); }