You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2014/12/23 03:24:46 UTC

hbase git commit: HBASE-12744 hbase-default.xml lists hbase.regionserver.global.memstore.size twice (Jerry He)

Repository: hbase
Updated Branches:
  refs/heads/branch-1 83cf07db6 -> 9b401498f


HBASE-12744 hbase-default.xml lists hbase.regionserver.global.memstore.size twice (Jerry He)


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

Branch: refs/heads/branch-1
Commit: 9b401498f78283b07e313ccdb90991d20ef246da
Parents: 83cf07d
Author: Enis Soztutar <en...@apache.org>
Authored: Mon Dec 22 18:24:34 2014 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Mon Dec 22 18:24:34 2014 -0800

----------------------------------------------------------------------
 hbase-common/src/main/resources/hbase-default.xml | 8 --------
 1 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/9b401498/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 9f0c3fe..877199e 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -300,14 +300,6 @@ possible configurations would overwhelm and obscure the important.
       blocked due to memstore limiting.</description>
   </property>
   <property>
-    <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
-      flushes are forced until size of all memstores in a region server hits 
-      hbase.regionserver.global.memstore.lowerLimit.</description>
-  </property>
-  <property>
     <name>hbase.regionserver.optionalcacheflushinterval</name>
     <value>3600000</value>
     <description>