Return-Path: 
 <commits-return-15162-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0CA3B107DF
	for <apmail-hbase-commits-archive@www.apache.org>;
 Fri, 13 Sep 2013 21:31:56 +0000 (UTC)
Received: (qmail 48331 invoked by uid 500); 13 Sep 2013 21:31:55 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 48261 invoked by uid 500); 13 Sep 2013 21:31:55 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 48253 invoked by uid 99); 13 Sep 2013 21:31:55 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Sep 2013 21:31:55 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Sep 2013 21:31:54 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A9B8C23889D5;
	Fri, 13 Sep 2013 21:31:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1523112 -
 /hbase/branches/0.96/hbase-common/src/main/resources/hbase-default.xml
Date: Fri, 13 Sep 2013 21:31:34 -0000
To: commits@hbase.apache.org
From: stack@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130913213134.A9B8C23889D5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: stack
Date: Fri Sep 13 21:31:34 2013
New Revision: 1523112

URL: http://svn.apache.org/r1523112
Log:
HBASE-7296 Add hbase.master.loadbalancer.class in the documentation

Modified:
    hbase/branches/0.96/hbase-common/src/main/resources/hbase-default.xml

Modified: hbase/branches/0.96/hbase-common/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-common/src/main/resources/hbase-default.xml?rev=1523112&r1=1523111&r2=1523112&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-common/src/main/resources/hbase-default.xml (original)
+++ hbase/branches/0.96/hbase-common/src/main/resources/hbase-default.xml Fri Sep 13 21:31:34 2013
@@ -1048,4 +1048,11 @@ possible configurations would overwhelm 
       Servlet filters for REST service.
     </description>
   </property>
+  <property>
+    <name>hbase.master.loadbalancer.class</name>
+    <value>org.apache.hadoop.hbase.master.balancer.DefaultLoadBalancer</value>
+    <description>
+      Class used to execute the regions balancing when the period occurs.
+    </description>
+  </property>
 </configuration>