From 7bf66f9483a928edce07f52367cafcb52f5c5fb1 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 26 Mar 2009 12:57:45 +0000
Subject: [PATCH] HBASE-1289 Remove hbase.fully.distributed option and update
 docs

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@758615 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/hbase-default.xml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/conf/hbase-default.xml b/conf/hbase-default.xml
index 0aad47cd758..b59b67e219a 100644
--- a/conf/hbase-default.xml
+++ b/conf/hbase-default.xml
@@ -30,17 +30,12 @@
     E.g: hdfs://NAMENODE_SERVER:PORT/HBASE_ROOTDIR
     </description>
   </property>
-  <property>
-    <name>run.distributed</name>
-    <value>false</value>
-    <description>Enable this to run a distributed HBase. When this is disabled
-    (the default) HBase runs all processes on the current host in a local mode.
-    </description>
-  </property>
   <property>
     <name>hbase.master.hostname</name>
-    <value>localhost</value>
-    <description>The host that the HBase master runs at.</description>
+    <value>local</value>
+    <description>The host that the HBase master runs at.
+      A value of 'local' runs the master and regionserver in a single process.
+    </description>
   </property>
   <property>
     <name>hbase.master.port</name>