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/06/09 01:01:23 UTC

git commit: HBASE-11260 hbase-default.xml refers to hbase.regionserver.global.memstore.upperLimit which is deprecated

Repository: hbase
Updated Branches:
  refs/heads/master b436d20d5 -> 172c93029


HBASE-11260 hbase-default.xml refers to hbase.regionserver.global.memstore.upperLimit which is deprecated


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/172c9302
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/172c9302
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/172c9302

Branch: refs/heads/master
Commit: 172c93029defef29aea123109aabf1e3ecda2193
Parents: b436d20
Author: Ted Yu <te...@apache.org>
Authored: Sun Jun 8 23:01:09 2014 +0000
Committer: Ted Yu <te...@apache.org>
Committed: Sun Jun 8 23:01:09 2014 +0000

----------------------------------------------------------------------
 hbase-common/src/main/resources/hbase-default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/172c9302/hbase-common/src/main/resources/hbase-default.xml
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index 7ff4cc2..9773251 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -247,7 +247,7 @@ possible configurations would overwhelm and obscure the important.
       blocked due to memstore limiting.</description>
   </property>
   <property>
-    <name>hbase.regionserver.global.memstore.upperLimit</name>
+    <name>hbase.regionserver.global.memstore.size</name>
     <value>0.4</value>
     <description>Maximum size of all memstores in a region server before new updates are blocked 
       and flushes are forced. Defaults to 40% of heap (0.4). Updates are blocked and region level