http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/Abortable.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/Abortable.html 
b/devapidocs/org/apache/hadoop/hbase/Abortable.html
index 81f3c87..9ce565c 100644
--- a/devapidocs/org/apache/hadoop/hbase/Abortable.html
+++ b/devapidocs/org/apache/hadoop/hbase/Abortable.html
@@ -91,7 +91,7 @@
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a 
href="../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html" 
title="class in org.apache.hadoop.hbase.client">ConnectionImplementation</a>, 
<a 
href="../../../../org/apache/hadoop/hbase/client/ConnectionUtils.MasterlessConnection.html"
 title="class in 
org.apache.hadoop.hbase.client">ConnectionUtils.MasterlessConnection</a>, <a 
href="../../../../org/apache/hadoop/hbase/client/CoprocessorHConnection.html" 
title="class in org.apache.hadoop.hbase.client">CoprocessorHConnection</a>, <a 
href="../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html" title="class 
in org.apache.hadoop.hbase.client">HBaseAdmin</a>, <a 
href="../../../../org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html"
 title="class in 
org.apache.hadoop.hbase.client">HBaseAdmin.ThrowableAbortable</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.html"
 title="class in org.apache.hadoop.hbase.replication.regionserver">HBaseIn
 terClusterReplicationEndpoint</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.html"
 title="class in 
org.apache.hadoop.hbase.replication">HBaseReplicationEndpoint</a>, <a 
href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in 
org.apache.hadoop.hbase.master">HMaster</a>, <a 
href="../../../../org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html"
 title="class in 
org.apache.hadoop.hbase.master">HMasterCommandLine.LocalHMaster</a>, <a 
href="../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" 
title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.html"
 title="class in 
org.apache.hadoop.hbase.replication.regionserver">RegionReplicaReplicationEndpoint</a>,
 <a 
href="../../../../org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.html"
 title="class in org.apache.hadoop
 .hbase.replication.master">ReplicationLogCleaner</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html"
 title="class in 
org.apache.hadoop.hbase.replication">ReplicationPeerZKImpl</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.DummyServer.html"
 title="class in 
org.apache.hadoop.hbase.replication.regionserver">ReplicationSyncUp.DummyServer</a>,
 <a 
href="../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.DummyMobAbortable.html"
 title="class in 
org.apache.hadoop.hbase.mob.mapreduce">SweepJob.DummyMobAbortable</a>, <a 
href="../../../../org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.html"
 title="class in 
org.apache.hadoop.hbase.client">ZooKeeperKeepAliveConnection</a>, <a 
href="../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a></dd>
+<dd><a 
href="../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html" 
title="class in org.apache.hadoop.hbase.client">ConnectionImplementation</a>, 
<a 
href="../../../../org/apache/hadoop/hbase/client/ConnectionUtils.MasterlessConnection.html"
 title="class in 
org.apache.hadoop.hbase.client">ConnectionUtils.MasterlessConnection</a>, <a 
href="../../../../org/apache/hadoop/hbase/client/CoprocessorHConnection.html" 
title="class in org.apache.hadoop.hbase.client">CoprocessorHConnection</a>, <a 
href="../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html" title="class 
in org.apache.hadoop.hbase.client">HBaseAdmin</a>, <a 
href="../../../../org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html"
 title="class in 
org.apache.hadoop.hbase.client">HBaseAdmin.ThrowableAbortable</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.html"
 title="class in org.apache.hadoop.hbase.replication.regionserver">HBaseIn
 terClusterReplicationEndpoint</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.html"
 title="class in 
org.apache.hadoop.hbase.replication">HBaseReplicationEndpoint</a>, <a 
href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in 
org.apache.hadoop.hbase.master">HMaster</a>, <a 
href="../../../../org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html"
 title="class in 
org.apache.hadoop.hbase.master">HMasterCommandLine.LocalHMaster</a>, <a 
href="../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" 
title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.html"
 title="class in 
org.apache.hadoop.hbase.replication.regionserver">RegionReplicaReplicationEndpoint</a>,
 <a 
href="../../../../org/apache/hadoop/hbase/replication/master/ReplicationHFileCleaner.html"
 title="class in org.apache.hado
 op.hbase.replication.master">ReplicationHFileCleaner</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.html"
 title="class in 
org.apache.hadoop.hbase.replication.master">ReplicationLogCleaner</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html"
 title="class in 
org.apache.hadoop.hbase.replication">ReplicationPeerZKImpl</a>, <a 
href="../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.DummyServer.html"
 title="class in 
org.apache.hadoop.hbase.replication.regionserver">ReplicationSyncUp.DummyServer</a>,
 <a 
href="../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.DummyMobAbortable.html"
 title="class in 
org.apache.hadoop.hbase.mob.mapreduce">SweepJob.DummyMobAbortable</a>, <a 
href="../../../../org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.html"
 title="class in 
org.apache.hadoop.hbase.client">ZooKeeperKeepAliveConnection</a>, <a 
href="../../../../org/apache/hadoop/h
 base/zookeeper/ZooKeeperWatcher.html" title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/HBaseConfiguration.html 
b/devapidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
index cf990f2..d86f8f0 100644
--- a/devapidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
+++ b/devapidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
@@ -106,7 +106,7 @@
 <br>
 <pre><a 
href="../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Public.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceAudience.Public</a>
 <a 
href="../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Stable.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceStability.Stable</a>
-public class <a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.38">HBaseConfiguration</a>
+public class <a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.39">HBaseConfiguration</a>
 extends org.apache.hadoop.conf.Configuration</pre>
 <div class="block">Adds HBase configuration files to a Configuration</div>
 </li>
@@ -195,19 +195,44 @@ extends org.apache.hadoop.conf.Configuration</pre>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private static void</code></td>
-<td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#checkDefaultsVersion(org.apache.hadoop.conf.Configuration)">checkDefaultsVersion</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
+<td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#applyClusterKeyToConf(org.apache.hadoop.conf.Configuration,%20java.lang.String)">applyClusterKeyToConf</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                                          <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;key)</code>
+<div class="block">Apply the settings in the given key to the given 
configuration, this is
+ used to communicate with distant clusters</div>
+</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private static void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#checkDefaultsVersion(org.apache.hadoop.conf.Configuration)">checkDefaultsVersion</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static 
org.apache.hadoop.conf.Configuration</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#create()">create</a></strong>()</code>
 <div class="block">Creates a Configuration with HBase resources</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static 
org.apache.hadoop.conf.Configuration</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#create(org.apache.hadoop.conf.Configuration)">create</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;that)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static 
org.apache.hadoop.conf.Configuration</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String)">createClusterConf</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;baseConf,
+                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;clusterKey)</code>
+<div class="block">Generates a <code>Configuration</code> instance by applying 
the ZooKeeper cluster key
+ to the base Configuration.</div>
+</td>
+</tr>
 <tr class="altColor">
+<td class="colFirst"><code>static 
org.apache.hadoop.conf.Configuration</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String)">createClusterConf</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;baseConf,
+                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;clusterKey,
+                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;overridePrefix)</code>
+<div class="block">Generates a <code>Configuration</code> instance by applying 
property overrides prefixed by
+ a cluster profile key to the base Configuration.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#getInt(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String,%20int)">getInt</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
             <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name,
@@ -217,7 +242,7 @@ extends org.apache.hadoop.conf.Configuration</pre>
  referring to the deprecated name of the configuration property.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#getPassword(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String)">getPassword</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                       <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;alias,
@@ -226,23 +251,32 @@ extends org.apache.hadoop.conf.Configuration</pre>
  getPassword method if it exists.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#isShowConfInServlet()">isShowConfInServlet</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#main(java.lang.String[])">main</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>[]&nbsp;args)</code>
 <div class="block">For debugging.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#merge(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.conf.Configuration)">merge</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;destConf,
           org.apache.hadoop.conf.Configuration&nbsp;srcConf)</code>
 <div class="block">Merge two configurations.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#setWithPrefix(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.Iterable)">setWithPrefix</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                          <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;prefix,
+                          <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Iterable.html?is-external=true";
 title="class or interface in java.lang">Iterable</a>&lt;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true";
 title="class or interface in java.util">Map.Entry</a>&lt;<a 
href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&gt;&gt;&nbsp;properties)</code>
+<div class="block">Sets all the entries in the provided <code>Map&lt;String, 
String&gt;</code> as properties in the
+ given <code>Configuration</code>.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static 
org.apache.hadoop.conf.Configuration</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#subset(org.apache.hadoop.conf.Configuration,%20java.lang.String)">subset</a></strong>(org.apache.hadoop.conf.Configuration&nbsp;srcConf,
@@ -285,7 +319,7 @@ extends org.apache.hadoop.conf.Configuration</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.apache.commons.logging.Log <a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.39">LOG</a></pre>
+<pre>private static final&nbsp;org.apache.commons.logging.Log <a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.40">LOG</a></pre>
 </li>
 </ul>
 </li>
@@ -303,7 +337,7 @@ extends org.apache.hadoop.conf.Configuration</pre>
 <li class="blockList">
 <h4>HBaseConfiguration</h4>
 <pre><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true";
 title="class or interface in java.lang">@Deprecated</a>
-public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.47">HBaseConfiguration</a>()</pre>
+public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.48">HBaseConfiguration</a>()</pre>
 <div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>Please use 
create() instead.</i></div>
 <div class="block">Instantiating HBaseConfiguration() is deprecated. Please use
  HBaseConfiguration#create() to construct a plain Configuration</div>
@@ -316,7 +350,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <li class="blockList">
 <h4>HBaseConfiguration</h4>
 <pre><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true";
 title="class or interface in java.lang">@Deprecated</a>
-public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.61">HBaseConfiguration</a>(org.apache.hadoop.conf.Configuration&nbsp;c)</pre>
+public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.62">HBaseConfiguration</a>(org.apache.hadoop.conf.Configuration&nbsp;c)</pre>
 <div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>Please user 
create(conf) instead.</i></div>
 <div class="block">Instantiating HBaseConfiguration() is deprecated. Please use
  HBaseConfiguration#create(conf) to construct a plain Configuration</div>
@@ -336,7 +370,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <ul class="blockList">
 <li class="blockList">
 <h4>checkDefaultsVersion</h4>
-<pre>private static&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.67">checkDefaultsVersion</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>private static&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.68">checkDefaultsVersion</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 <a name="addHbaseResources(org.apache.hadoop.conf.Configuration)">
@@ -345,7 +379,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <ul class="blockList">
 <li class="blockList">
 <h4>addHbaseResources</h4>
-<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.78">addHbaseResources</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.79">addHbaseResources</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 <a name="create()">
@@ -354,7 +388,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <ul class="blockList">
 <li class="blockList">
 <h4>create</h4>
-<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.91">create</a>()</pre>
+<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.92">create</a>()</pre>
 <div class="block">Creates a Configuration with HBase resources</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>a Configuration with 
HBase resources</dd></dl>
 </li>
@@ -365,7 +399,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <ul class="blockList">
 <li class="blockList">
 <h4>create</h4>
-<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.105">create</a>(org.apache.hadoop.conf.Configuration&nbsp;that)</pre>
+<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.106">create</a>(org.apache.hadoop.conf.Configuration&nbsp;that)</pre>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>that</code> - 
Configuration to clone.</dd>
 <dt><span class="strong">Returns:</span></dt><dd>a Configuration created with 
the hbase-*.xml files plus
  the given configuration.</dd></dl>
@@ -377,7 +411,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <ul class="blockList">
 <li class="blockList">
 <h4>merge</h4>
-<pre>public static&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.117">merge</a>(org.apache.hadoop.conf.Configuration&nbsp;destConf,
+<pre>public static&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.118">merge</a>(org.apache.hadoop.conf.Configuration&nbsp;destConf,
          org.apache.hadoop.conf.Configuration&nbsp;srcConf)</pre>
 <div class="block">Merge two configurations.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>destConf</code> 
- the configuration that will be overwritten with items
@@ -390,7 +424,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <ul class="blockList">
 <li class="blockList">
 <h4>subset</h4>
-<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.130">subset</a>(org.apache.hadoop.conf.Configuration&nbsp;srcConf,
+<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.131">subset</a>(org.apache.hadoop.conf.Configuration&nbsp;srcConf,
                                           <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;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,13 +433,27 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
  included in the results, since it would show up as an entry with an empty 
key.</div>
 </li>
 </ul>
+<a name="setWithPrefix(org.apache.hadoop.conf.Configuration, java.lang.String, 
java.lang.Iterable)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setWithPrefix</h4>
+<pre>public static&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.150">setWithPrefix</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;prefix,
+                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Iterable.html?is-external=true";
 title="class or interface in java.lang">Iterable</a>&lt;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true";
 title="class or interface in java.util">Map.Entry</a>&lt;<a 
href="http://docs.oracle.com/javase/7/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/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&gt;&gt;&nbsp;properties)</pre>
+<div class="block">Sets all the entries in the provided <code>Map&lt;String, 
String&gt;</code> as properties in the
+ given <code>Configuration</code>.  Each property will have the specified 
prefix prepended,
+ so that the configuration entries are keyed by <code>prefix + 
entry.getKey()</code>.</div>
+</li>
+</ul>
 <a name="isShowConfInServlet()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isShowConfInServlet</h4>
-<pre>public static&nbsp;boolean&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.147">isShowConfInServlet</a>()</pre>
+<pre>public static&nbsp;boolean&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.160">isShowConfInServlet</a>()</pre>
 <dl><dt><span class="strong">Returns:</span></dt><dd>whether to show HBase 
Configuration in servlet</dd></dl>
 </li>
 </ul>
@@ -415,7 +463,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <ul class="blockList">
 <li class="blockList">
 <h4>getInt</h4>
-<pre>public static&nbsp;int&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.181">getInt</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;int&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.194">getInt</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
          <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name,
          <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;deprecatedName,
          int&nbsp;defaultValue)</pre>
@@ -438,7 +486,7 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <ul class="blockList">
 <li class="blockList">
 <h4>getPassword</h4>
-<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.203">getPassword</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.216">getPassword</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;alias,
                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;defPass)
                           throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
@@ -451,13 +499,69 @@ public&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
 <dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd></dl>
 </li>
 </ul>
+<a name="createClusterConf(org.apache.hadoop.conf.Configuration, 
java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createClusterConf</h4>
+<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.264">createClusterConf</a>(org.apache.hadoop.conf.Configuration&nbsp;baseConf,
+                                                     <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;clusterKey)
+                                                              throws <a 
href="http://docs.oracle.com/javase/7/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
+ to the base Configuration.  Note that additional configuration properties may 
be needed
+ for a remote cluster, so it is preferable to use
+ <a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String)"><code>createClusterConf(Configuration,
 String, String)</code></a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>baseConf</code> 
- the base configuration to use, containing prefixed override 
properties</dd><dd><code>clusterKey</code> - the ZooKeeper quorum cluster key 
to apply, or <code>null</code> if none</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the merged configuration with 
override properties and cluster key applied</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd><dt><span 
class="strong">See Also:</span></dt><dd><a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String)"><code>createClusterConf(Configuration,
 String, String)</code></a></dd></dl>
+</li>
+</ul>
+<a name="createClusterConf(org.apache.hadoop.conf.Configuration, 
java.lang.String, java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createClusterConf</h4>
+<pre>public static&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.281">createClusterConf</a>(org.apache.hadoop.conf.Configuration&nbsp;baseConf,
+                                                     <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;clusterKey,
+                                                     <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;overridePrefix)
+                                                              throws <a 
href="http://docs.oracle.com/javase/7/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 
property overrides prefixed by
+ a cluster profile key to the base Configuration.  Override properties are 
extracted by
+ the <a 
href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#subset(org.apache.hadoop.conf.Configuration,%20java.lang.String)"><code>subset(Configuration,
 String)</code></a> method, then the merged on top of the base
+ Configuration and returned.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>baseConf</code> 
- the base configuration to use, containing prefixed override 
properties</dd><dd><code>clusterKey</code> - the ZooKeeper quorum cluster key 
to apply, or <code>null</code> if none</dd><dd><code>overridePrefix</code> - 
the property key prefix to match for override properties,
+     or <code>null</code> if none</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the merged configuration with 
override properties and cluster key applied</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd></dl>
+</li>
+</ul>
+<a name="applyClusterKeyToConf(org.apache.hadoop.conf.Configuration, 
java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>applyClusterKeyToConf</h4>
+<pre>private static&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.302">applyClusterKeyToConf</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                         <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;key)
+                                   throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
+<div class="block">Apply the settings in the given key to the given 
configuration, this is
+ used to communicate with distant clusters</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>conf</code> - 
configuration object to configure</dd><dd><code>key</code> - string that 
contains the 3 required configuratins</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd></dl>
+</li>
+</ul>
 <a name="main(java.lang.String[])">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.243">main</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.315">main</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a 
href="http://docs.oracle.com/javase/7/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

Reply via email to