diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 3b303d7..79567f8 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -92,7 +92,7 @@ org.apache.hadoop.hbase.HBaseConfiguration;
-
+

Master: <% master.getServerName().getHostname() %>

diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 3be3446..93606d5 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -89,7 +89,7 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
-
+

RegionServer: <% serverName.getHostname() %>

diff --git hbase-server/src/main/resources/hbase-webapps/master/table.jsp hbase-server/src/main/resources/hbase-webapps/master/table.jsp index a2b4297..87772e9 100644 --- hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -106,7 +106,7 @@
-
+

Table action request accepted

diff --git hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp index d087029..6cd0656 100644 --- hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp +++ hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp @@ -71,7 +71,7 @@
-
+

User Tables

diff --git hbase-server/src/main/resources/hbase-webapps/master/zk.jsp hbase-server/src/main/resources/hbase-webapps/master/zk.jsp index c205d7f..e02062e 100644 --- hbase-server/src/main/resources/hbase-webapps/master/zk.jsp +++ hbase-server/src/main/resources/hbase-webapps/master/zk.jsp @@ -34,24 +34,62 @@ %> - + - -ZooKeeper Dump - + + + ZooKeeper Dump + + + + + + + + + - - -

ZooKeeper Dump

- -
-
-<%= ZKUtil.dump(watcher) %>
-
+ + + + +
+
+
+

Zookeeper Dump

+
+ +
+
+
+
<%= ZKUtil.dump(watcher).trim() %>
+
+
+
- + diff --git hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css index 5fc6d31..d7983d9 100644 --- hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css +++ hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css @@ -17,3 +17,4 @@ */ body { padding-top: 60px; } .logo img { float: right; } +.inner_header { margin-bottom: 1em;}