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 2015/08/06 17:10:34 UTC
hbase git commit: HBASE-14021 Revert - there is no quota support in
branch-1.0
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 c4366aef1 -> 821ce6a1b
HBASE-14021 Revert - there is no quota support in branch-1.0
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/821ce6a1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/821ce6a1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/821ce6a1
Branch: refs/heads/branch-1.0
Commit: 821ce6a1bb4242ed0a026893cbdb12f881844999
Parents: c4366ae
Author: tedyu <yu...@gmail.com>
Authored: Thu Aug 6 08:10:31 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Thu Aug 6 08:10:31 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/821ce6a1/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 7142539..8dbb6ea 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,7 +51,6 @@ 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") %>
@@ -356,11 +355,8 @@ 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 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.";
+ } else {
+ description = "The .NAMESPACE. table holds information about namespaces.";
}
</%java>
<td><% description %></td>