http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d9f3c819/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
b/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
index 27234d1..c7bfaea 100644
--- a/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
+++ b/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
@@ -120,7 +120,7 @@ var activeTableTab = "activeTableTab";
<br>
<pre>@InterfaceAudience.Public
@InterfaceStability.Stable
-public class <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.39">HBaseConfiguration</a>
+public class <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.38">HBaseConfiguration</a>
extends org.apache.hadoop.conf.Configuration</pre>
<div class="block">Adds HBase configuration files to a Configuration</div>
</li>
@@ -295,7 +295,7 @@ extends org.apache.hadoop.conf.Configuration</pre>
<li class="blockList">
<h4>HBaseConfiguration</h4>
<pre><a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true"
title="class or interface in java.lang">@Deprecated</a>
-public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.48">HBaseConfiguration</a>()</pre>
+public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.47">HBaseConfiguration</a>()</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span
class="deprecationComment">Please use create() instead.</span></div>
<div class="block">Instantiating HBaseConfiguration() is deprecated. Please use
HBaseConfiguration#create() to construct a plain Configuration</div>
@@ -308,7 +308,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<li class="blockList">
<h4>HBaseConfiguration</h4>
<pre><a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true"
title="class or interface in java.lang">@Deprecated</a>
-public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.62">HBaseConfiguration</a>(org.apache.hadoop.conf.Configuration c)</pre>
+public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.61">HBaseConfiguration</a>(org.apache.hadoop.conf.Configuration c)</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span
class="deprecationComment">Please user create(conf) instead.</span></div>
<div class="block">Instantiating HBaseConfiguration() is deprecated. Please use
HBaseConfiguration#create(conf) to construct a plain Configuration</div>
@@ -328,7 +328,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>addHbaseResources</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.79">addHbaseResources</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.78">addHbaseResources</a>(org.apache.hadoop.conf.Configuration conf)</pre>
</li>
</ul>
<a name="create--">
@@ -337,7 +337,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>create</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.92">create</a>()</pre>
+<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.90">create</a>()</pre>
<div class="block">Creates a Configuration with HBase resources</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -351,7 +351,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>create</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.106">create</a>(org.apache.hadoop.conf.Configuration that)</pre>
+<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.104">create</a>(org.apache.hadoop.conf.Configuration that)</pre>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>that</code> - Configuration to clone.</dd>
@@ -367,7 +367,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>merge</h4>
-<pre>public static void <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.118">merge</a>(org.apache.hadoop.conf.Configuration destConf,
+<pre>public static void <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.116">merge</a>(org.apache.hadoop.conf.Configuration destConf,
org.apache.hadoop.conf.Configuration srcConf)</pre>
<div class="block">Merge two configurations.</div>
<dl>
@@ -384,7 +384,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>subset</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.131">subset</a>(org.apache.hadoop.conf.Configuration srcConf,
+<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.129">subset</a>(org.apache.hadoop.conf.Configuration srcConf,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> prefix)</pre>
<div class="block">Returns a subset of the configuration properties, matching
the given key prefix.
The prefix is stripped from the return keys, ie. when calling with a prefix
of "myprefix",
@@ -399,7 +399,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>setWithPrefix</h4>
-<pre>public static void <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.150">setWithPrefix</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public static void <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.148">setWithPrefix</a>(org.apache.hadoop.conf.Configuration conf,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> prefix,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true"
title="class or interface in java.lang">Iterable</a><<a
href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.Entry.html?is-external=true"
title="class or interface in java.util">Map.Entry</a><<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a>,<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in
java.lang">String</a>>> properties)</pre>
<div class="block">Sets all the entries in the provided <code>Map<String,
String></code> as properties in the
@@ -413,7 +413,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>isShowConfInServlet</h4>
-<pre>public static boolean <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.160">isShowConfInServlet</a>()</pre>
+<pre>public static boolean <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.158">isShowConfInServlet</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>whether to show HBase Configuration in servlet</dd>
@@ -426,7 +426,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>getInt</h4>
-<pre>public static int <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.194">getInt</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public static int <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.192">getInt</a>(org.apache.hadoop.conf.Configuration conf,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> name,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> deprecatedName,
int defaultValue)</pre>
@@ -455,7 +455,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>getPassword</h4>
-<pre>public static <a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.216">getPassword</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public static <a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.214">getPassword</a>(org.apache.hadoop.conf.Configuration conf,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> alias,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> defPass)
throws <a
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true"
title="class or interface in java.io">IOException</a></pre>
@@ -480,7 +480,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>createClusterConf</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.264">createClusterConf</a>(org.apache.hadoop.conf.Configuration baseConf,
+<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.262">createClusterConf</a>(org.apache.hadoop.conf.Configuration baseConf,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> clusterKey)
throws <a
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true"
title="class or interface in java.io">IOException</a></pre>
<div class="block">Generates a <code>Configuration</code> instance by applying
the ZooKeeper cluster key
@@ -506,7 +506,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>createClusterConf</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.281">createClusterConf</a>(org.apache.hadoop.conf.Configuration baseConf,
+<pre>public static org.apache.hadoop.conf.Configuration <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.279">createClusterConf</a>(org.apache.hadoop.conf.Configuration baseConf,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> clusterKey,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a> overridePrefix)
throws <a
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true"
title="class or interface in java.io">IOException</a></pre>
@@ -533,7 +533,7 @@ public <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.315">main</a>(<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.313">main</a>(<a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true"
title="class or interface in java.lang">String</a>[] args)
throws <a
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true"
title="class or interface in java.lang">Exception</a></pre>
<div class="block">For debugging. Dump configurations to system output as xml
format.
Master and RS configurations can also be dumped using