[2/2] hbase git commit: HBASE-13796 ZKUtil doesn't clean quorum setting properly

[apurtell]

HBASE-13796 ZKUtil doesn't clean quorum setting properly

Signed-off-by: stack <st...@apache.org>

Conflicts:
        
hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/22f537d9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/22f537d9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/22f537d9

Branch: refs/heads/0.98
Commit: 22f537d9fa8b9b43c67630b5e048e17c1873c5c1
Parents: 33ecfc3
Author: Geoffrey <gjac...@salesforce.com>
Authored: Thu May 28 14:33:19 2015 -0700
Committer: Andrew Purtell <apurt...@apache.org>
Committed: Tue Dec 8 16:12:58 2015 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java | 4 ++--
 .../test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/22f537d9/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
----------------------------------------------------------------------
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
index e0809d9..fd46762 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
@@ -361,8 +361,8 @@ public class ZKUtil {
    * @return ensemble key with a name (if any)
    */
   public static String getZooKeeperClusterKey(Configuration conf, String name) 
{
-    String ensemble = conf.get(HConstants.ZOOKEEPER_QUORUM.replaceAll(
-        "[\\t\\n\\x0B\\f\\r]", ""));
+    String ensemble = conf.get(HConstants.ZOOKEEPER_QUORUM).replaceAll(
+        "[\\t\\n\\x0B\\f\\r]", "");
     StringBuilder builder = new StringBuilder(ensemble);
     builder.append(":");
     builder.append(conf.get(HConstants.ZOOKEEPER_CLIENT_PORT));

http://git-wip-us.apache.org/repos/asf/hbase/blob/22f537d9/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java
----------------------------------------------------------------------
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java
index 72de935..cad1afa 100644
--- 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java
+++ 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java
@@ -34,9 +34,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-/**
- *
- */
 @Category({SmallTests.class})
 public class TestZKUtil {
 
@@ -50,7 +47,7 @@ public class TestZKUtil {
     Assert.assertTrue(!clusterKey.contains("\t") && 
!clusterKey.contains("\n"));
     Assert.assertEquals("localhost:3333:hbase,test", clusterKey);
   }
-  
+
   @Test
   public void testCreateACL() throws ZooKeeperConnectionException, IOException 
{
     Configuration conf = HBaseConfiguration.create();