Repository: hbase Updated Branches: refs/heads/branch-1.0 949092004 -> c4366aef1
HBASE-14021 Quota table has a wrong description on the UI (Ashish Singhi) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c4366aef Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c4366aef Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c4366aef Branch: refs/heads/branch-1.0 Commit: c4366aef1ea23f104263d2f933c399b1af3fe873 Parents: 9490920 Author: tedyu <[email protected]> Authored: Thu Aug 6 07:31:17 2015 -0700 Committer: tedyu <[email protected]> Committed: Thu Aug 6 07:31:17 2015 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c4366aef/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 8dbb6ea..7142539 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -51,6 +51,7 @@ 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; +org.apache.hadoop.hbase.quotas.QuotaUtil; </%import> <%if format.equals("json") %> @@ -355,8 +356,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); 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."; + } else if (tableName.equals(TableName.NAMESPACE_TABLE_NAME)){ + description = "The hbase:namespace table holds information about namespaces."; + } else if (tableName.equals(QuotaUtil.QUOTA_TABLE_NAME)){ + description = "The hbase:quota table holds quota information about number" + + " or size of requests in a given time frame."; } </%java> <td><% description %></td>
