From 6a14cf358524b5feaf691111fab6e8bdb9e34552 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Mon, 28 Jul 2014 12:43:00 -0700
Subject: [PATCH] HBASE-11560 hbase.regionserver.global.memstore.size is
 documented twice (Misty Stanley-Jones)

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

diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index f6172456710..d806b87b0f1 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -262,14 +262,6 @@ possible configurations would overwhelm and obscure the important.
       A 100% value for this value causes the minimum possible flushing to occur when updates are 
       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>