svn commit: r1099206 - /hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon

[todd]

Author: todd
Date: Tue May  3 19:11:25 2011
New Revision: 1099206

URL: http://svn.apache.org/viewvc?rev=1099206&view=rev
Log:
Fix up bad resolve of trunk conflict from HBASE-3835

Modified:
    
hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon

Modified: 
hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1099206&r1=1099205&r2=1099206&view=diff
==============================================================================
--- 
hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon 
(original)
+++ 
hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon 
Tue May  3 19:11:25 2011
@@ -183,9 +183,8 @@ org.apache.hadoop.hbase.HTableDescriptor
      for (ServerName serverName: serverNames) {
        // TODO: this is incorrect since this conf might differ from RS to RS
        // or be set to 0 to get ephemeral ports
-       int infoPort = conf.getInt("hbase.regionserver.info.port", 60030);
+       int infoPort = 
master.getConfiguration().getInt("hbase.regionserver.info.port", 60030);
        String hostname = serverName.getHostname() + ":" + infoPort;
-       String hostname = serverName.getHostname() + ":60030";
        String url = "http://"; + hostname + "/";
        HServerLoad hsl = master.getServerManager().getLoad(serverName);
        String loadStr = hsl == null? "-": hsl.toString();