You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/04/29 21:48:25 UTC
svn commit: r1591070 -
/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
Author: tedyu
Date: Tue Apr 29 19:48:25 2014
New Revision: 1591070
URL: http://svn.apache.org/r1591070
Log:
HBASE-10611 Description for hbase:acl table is wrong on master-status#catalogTables (Rekha Joshi)
Modified:
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
Modified: hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1591070&r1=1591069&r2=1591070&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Tue Apr 29 19:48:25 2014
@@ -50,7 +50,10 @@ org.apache.hadoop.hbase.TableName;
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
org.apache.hadoop.hbase.master.DeadServer;
org.apache.hadoop.hbase.protobuf.ProtobufUtil;
+org.apache.hadoop.hbase.security.visibility.VisibilityConstants;
+org.apache.hadoop.hbase.security.access.AccessControlLists;
</%import>
+
<%if format.equals("json") %>
<& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
<%java return; %>
@@ -322,6 +325,10 @@ AssignmentManager assignmentManager = ma
<%java>String description = null;
if (tableName.equals(TableName.META_TABLE_NAME)){
description = "The hbase:meta table holds references to all User Table regions";
+ } else if (tableName.equals(AccessControlLists.ACL_TABLE_NAME)){
+ description = "The hbase:acl table holds information about acl";
+ } else if (tableName.equals(VisibilityConstants.LABELS_TABLE_NAME)){
+ description = "The hbase:labels table holds information about visibility labels";
} else {
description = "The .NAMESPACE. table holds information about namespaces.";
}