Repository: hbase
Updated Branches:
  refs/heads/0.98 b9c8fd9eb -> 3cd5cf819


HBASE-11162 RegionServer webui uses the default master info port irrespective 
of the user configuration (Srikanth)


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

Branch: refs/heads/0.98
Commit: 3cd5cf81939ce6470544855f9d26423e27e0bc76
Parents: b9c8fd9
Author: Jimmy Xiang <[email protected]>
Authored: Thu Jun 12 20:06:10 2014 -0700
Committer: Jimmy Xiang <[email protected]>
Committed: Thu Jun 12 20:06:10 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/3cd5cf81/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 5ec5bfb..83a3ece 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1327,7 +1327,8 @@ MasterServices, Server {
   protected RegionServerStartupResponse.Builder createConfigurationSubset() {
     RegionServerStartupResponse.Builder resp = addConfig(
       RegionServerStartupResponse.newBuilder(), HConstants.HBASE_DIR);
-    return addConfig(resp, "fs.default.name");
+    resp = addConfig(resp, "fs.default.name");
+    return addConfig(resp, "hbase.master.info.port");
   }
 
   private RegionServerStartupResponse.Builder addConfig(

Reply via email to