Repository: hbase Updated Branches: refs/heads/branch-1.2 2906b44c5 -> 64511ec89
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/64511ec8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/64511ec8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/64511ec8 Branch: refs/heads/branch-1.2 Commit: 64511ec8984118638d63217abf5ff8a4ecb9f40d Parents: 2906b44 Author: tedyu <[email protected]> Authored: Tue Aug 4 18:21:58 2015 -0700 Committer: tedyu <[email protected]> Committed: Tue Aug 4 18:21:58 2015 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/64511ec8/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 6e40c73..caa3535 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 @@ -53,6 +53,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") %> @@ -370,8 +371,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 { + } 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>
