You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2015/12/10 18:13:11 UTC

[49/51] [partial] hbase-site git commit: Published site at 26ac60b03f80c9215103a02db783341e67037753.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/apidocs/deprecated-list.html
----------------------------------------------------------------------
diff --git a/apidocs/deprecated-list.html b/apidocs/deprecated-list.html
index fa157ed..f506f70 100644
--- a/apidocs/deprecated-list.html
+++ b/apidocs/deprecated-list.html
@@ -421,102 +421,107 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initCredentialsForCluster(org.apache.hadoop.mapreduce.Job,%20java.lang.String)">org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.initCredentialsForCluster(Job, String)</a>
+<div class="block"><i>Since 1.2.0, use <a href="org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initCredentialsForCluster(org.apache.hadoop.mapreduce.Job,%20org.apache.hadoop.conf.Configuration)"><code>TableMapReduceUtil.initCredentialsForCluster(Job, Configuration)</code></a> instead.</i></div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/Get.html#isClosestRowBefore()">org.apache.hadoop.hbase.client.Get.isClosestRowBefore()</a>
 <div class="block"><i>since 2.0.0 and will be removed in 3.0.0</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#isDeadServer(org.apache.hadoop.hbase.ServerName)">org.apache.hadoop.hbase.client.HConnection.isDeadServer(ServerName)</a>
 <div class="block"><i>internal method, do not use thru HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#isMasterRunning()">org.apache.hadoop.hbase.client.HConnection.isMasterRunning()</a>
 <div class="block"><i>internal method, do not use thru HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#isTableAvailable(byte[])">org.apache.hadoop.hbase.client.HConnection.isTableAvailable(byte[])</a>
 <div class="block"><i>instead use <a href="org/apache/hadoop/hbase/client/HConnection.html#isTableAvailable(org.apache.hadoop.hbase.TableName)"><code>HConnection.isTableAvailable(TableName)</code></a></i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#isTableAvailable(byte[],%20byte[][])">org.apache.hadoop.hbase.client.HConnection.isTableAvailable(byte[], byte[][])</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#isTableAvailable(org.apache.hadoop.hbase.TableName,%20byte[][])">org.apache.hadoop.hbase.client.HConnection.isTableAvailable(TableName, byte[][])</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#isTableDisabled(byte[])">org.apache.hadoop.hbase.client.HConnection.isTableDisabled(byte[])</a>
 <div class="block"><i>instead use <a href="org/apache/hadoop/hbase/client/HConnection.html#isTableDisabled(org.apache.hadoop.hbase.TableName)"><code>HConnection.isTableDisabled(TableName)</code></a></i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#isTableEnabled(byte[])">org.apache.hadoop.hbase.client.HConnection.isTableEnabled(byte[])</a>
 <div class="block"><i>instead use <a href="org/apache/hadoop/hbase/client/HConnection.html#isTableEnabled(org.apache.hadoop.hbase.TableName)"><code>HConnection.isTableEnabled(TableName)</code></a></i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html#listPeers()">org.apache.hadoop.hbase.client.replication.ReplicationAdmin.listPeers()</a>
 <div class="block"><i>use <a href="org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html#listPeerConfigs()"><code>ReplicationAdmin.listPeerConfigs()</code></a></i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#listTableNames()">org.apache.hadoop.hbase.client.HConnection.listTableNames()</a>
 <div class="block"><i>Use <a href="org/apache/hadoop/hbase/client/Admin.html#listTables()"><code>Admin.listTables()</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#listTables()">org.apache.hadoop.hbase.client.HConnection.listTables()</a>
 <div class="block"><i>Use <a href="org/apache/hadoop/hbase/client/Admin.html#listTables()"><code>Admin.listTables()</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#locateRegion(byte[])">org.apache.hadoop.hbase.client.HConnection.locateRegion(byte[])</a>
 <div class="block"><i>internal method, do not use thru HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#locateRegion(byte[],%20byte[])">org.apache.hadoop.hbase.client.HConnection.locateRegion(byte[], byte[])</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#locateRegion(org.apache.hadoop.hbase.TableName,%20byte[])">org.apache.hadoop.hbase.client.HConnection.locateRegion(TableName, byte[])</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#locateRegions(byte[])">org.apache.hadoop.hbase.client.HConnection.locateRegions(byte[])</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#locateRegions(byte[],%20boolean,%20boolean)">org.apache.hadoop.hbase.client.HConnection.locateRegions(byte[], boolean, boolean)</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#locateRegions(org.apache.hadoop.hbase.TableName)">org.apache.hadoop.hbase.client.HConnection.locateRegions(TableName)</a>
 <div class="block"><i>internal method, do not use thru HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#locateRegions(org.apache.hadoop.hbase.TableName,%20boolean,%20boolean)">org.apache.hadoop.hbase.client.HConnection.locateRegions(TableName, boolean, boolean)</a>
 <div class="block"><i>internal method, do not use thru HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/CellUtil.html#matchingRow(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.Cell)">org.apache.hadoop.hbase.CellUtil.matchingRow(Cell, Cell)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 3.0.0.
              Instead use <a href="org/apache/hadoop/hbase/CellUtil.html#matchingRows(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.Cell)"><code>CellUtil.matchingRows(Cell, Cell)</code></a></i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/Admin.html#modifyColumn(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.HColumnDescriptor)">org.apache.hadoop.hbase.client.Admin.modifyColumn(TableName, HColumnDescriptor)</a>
 <div class="block"><i>As of release 2.0.0.
              (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
@@ -524,135 +529,135 @@
              Use <a href="org/apache/hadoop/hbase/client/Admin.html#modifyColumnFamily(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.HColumnDescriptor)"><code>Admin.modifyColumnFamily(TableName, HColumnDescriptor)</code></a>.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#processBatch(java.util.List,%20byte[],%20java.util.concurrent.ExecutorService,%20java.lang.Object[])">org.apache.hadoop.hbase.client.HConnection.processBatch(List<? extends Row>, byte[], ExecutorService, Object[])</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#processBatch(java.util.List,%20org.apache.hadoop.hbase.TableName,%20java.util.concurrent.ExecutorService,%20java.lang.Object[])">org.apache.hadoop.hbase.client.HConnection.processBatch(List<? extends Row>, TableName, ExecutorService, Object[])</a>
 <div class="block"><i>since 0.96 - Use <a href="org/apache/hadoop/hbase/client/Table.html#batch(java.util.List,%20java.lang.Object[])"><code>Table.batch(java.util.List&lt;? extends org.apache.hadoop.hbase.client.Row&gt;, java.lang.Object[])</code></a> instead</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#processBatchCallback(java.util.List,%20byte[],%20java.util.concurrent.ExecutorService,%20java.lang.Object[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">org.apache.hadoop.hbase.client.HConnection.processBatchCallback(List<? extends Row>, byte[], ExecutorService, Object[], Batch.Callback<R>)</a>
 <div class="block"><i>Unsupported API</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#processBatchCallback(java.util.List,%20org.apache.hadoop.hbase.TableName,%20java.util.concurrent.ExecutorService,%20java.lang.Object[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">org.apache.hadoop.hbase.client.HConnection.processBatchCallback(List<? extends Row>, TableName, ExecutorService, Object[], Batch.Callback<R>)</a>
 <div class="block"><i>since 0.96 - Use <a href="org/apache/hadoop/hbase/client/Table.html#batchCallback(java.util.List,%20java.lang.Object[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)"><code>Table.batchCallback(java.util.List&lt;? extends org.apache.hadoop.hbase.client.Row&gt;, java.lang.Object[], org.apache.hadoop.hbase.client.coprocessor.Batch.Callback&lt;R&gt;)</code></a> instead</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(byte[],%20java.util.List)">org.apache.hadoop.hbase.client.HTableMultiplexer.put(byte[], List<Put>)</a>
 <div class="block"><i>Use <a href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(org.apache.hadoop.hbase.TableName,%20java.util.List)"><code>HTableMultiplexer.put(TableName, List)</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(byte[],%20org.apache.hadoop.hbase.client.Put)">org.apache.hadoop.hbase.client.HTableMultiplexer.put(byte[], Put)</a>
 <div class="block"><i>Use <a href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Put)"><code>HTableMultiplexer.put(TableName, Put)</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(byte[],%20org.apache.hadoop.hbase.client.Put,%20int)">org.apache.hadoop.hbase.client.HTableMultiplexer.put(byte[], Put, int)</a>
 <div class="block"><i>Use <a href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Put)"><code>HTableMultiplexer.put(TableName, Put)</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/util/Bytes.html#putIntUnsafe(byte[],%20int,%20int)">org.apache.hadoop.hbase.util.Bytes.putIntUnsafe(byte[], int, int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 3.0.0.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/util/Bytes.html#putLongUnsafe(byte[],%20int,%20long)">org.apache.hadoop.hbase.util.Bytes.putLongUnsafe(byte[], int, long)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 3.0.0.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/util/Bytes.html#putShortUnsafe(byte[],%20int,%20short)">org.apache.hadoop.hbase.util.Bytes.putShortUnsafe(byte[], int, short)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 3.0.0.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/util/Bytes.html#readVLong(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.readVLong(byte[], int)</a>
 <div class="block"><i>Use <a href="org/apache/hadoop/hbase/util/Bytes.html#readAsVLong(byte[],%20int)"><code>Bytes.readAsVLong(byte[],int)</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#relocateRegion(byte[],%20byte[])">org.apache.hadoop.hbase.client.HConnection.relocateRegion(byte[], byte[])</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#relocateRegion(org.apache.hadoop.hbase.TableName,%20byte[])">org.apache.hadoop.hbase.client.HConnection.relocateRegion(TableName, byte[])</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/Get.html#setClosestRowBefore(boolean)">org.apache.hadoop.hbase.client.Get.setClosestRowBefore(boolean)</a>
 <div class="block"><i>since 2.0.0 and will be removed in 3.0.0</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/HTableDescriptor.html#setName(byte[])">org.apache.hadoop.hbase.HTableDescriptor.setName(byte[])</a></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/HTableDescriptor.html#setName(org.apache.hadoop.hbase.TableName)">org.apache.hadoop.hbase.HTableDescriptor.setName(TableName)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/HTableDescriptor.html#setOwner(org.apache.hadoop.hbase.security.User)">org.apache.hadoop.hbase.HTableDescriptor.setOwner(User)</a></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/HTableDescriptor.html#setOwnerString(java.lang.String)">org.apache.hadoop.hbase.HTableDescriptor.setOwnerString(String)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html#setPeerTableCFs(java.lang.String,%20java.lang.String)">org.apache.hadoop.hbase.client.replication.ReplicationAdmin.setPeerTableCFs(String, String)</a>
 <div class="block"><i>use <a href="org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html#setPeerTableCFs(java.lang.String,%20java.util.Map)"><code>ReplicationAdmin.setPeerTableCFs(String, Map)</code></a></i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#setRegionCachePrefetch(byte[],%20boolean)">org.apache.hadoop.hbase.client.HConnection.setRegionCachePrefetch(byte[], boolean)</a>
 <div class="block"><i>does nothing since 0.99</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#setRegionCachePrefetch(org.apache.hadoop.hbase.TableName,%20boolean)">org.apache.hadoop.hbase.client.HConnection.setRegionCachePrefetch(TableName, boolean)</a>
 <div class="block"><i>does nothing since since 0.99</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/Table.html#setWriteBufferSize(long)">org.apache.hadoop.hbase.client.Table.setWriteBufferSize(long)</a>
 <div class="block"><i>as of 1.0.1 (should not have been in 1.0.0). Replaced by <a href="org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client"><code>BufferedMutator</code></a> and
  <a href="org/apache/hadoop/hbase/client/BufferedMutatorParams.html#writeBufferSize(long)"><code>BufferedMutatorParams.writeBufferSize(long)</code></a></i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/util/Bytes.html#toIntUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toIntUnsafe(byte[], int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 3.0.0.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/util/Bytes.html#toLongUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toLongUnsafe(byte[], int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 3.0.0.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/util/Bytes.html#toShortUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toShortUnsafe(byte[], int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 3.0.0.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#updateCachedLocations(byte[],%20byte[],%20java.lang.Object,%20org.apache.hadoop.hbase.HRegionLocation)">org.apache.hadoop.hbase.client.HConnection.updateCachedLocations(byte[], byte[], Object, HRegionLocation)</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#updateCachedLocations(org.apache.hadoop.hbase.TableName,%20byte[],%20byte[],%20java.lang.Object,%20org.apache.hadoop.hbase.ServerName)">org.apache.hadoop.hbase.client.HConnection.updateCachedLocations(TableName, byte[], byte[], Object, ServerName)</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="org/apache/hadoop/hbase/client/HConnection.html#updateCachedLocations(org.apache.hadoop.hbase.TableName,%20byte[],%20java.lang.Object,%20org.apache.hadoop.hbase.HRegionLocation)">org.apache.hadoop.hbase.client.HConnection.updateCachedLocations(TableName, byte[], Object, HRegionLocation)</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/apidocs/index-all.html b/apidocs/index-all.html
index 15a3e4f..a4520e1 100644
--- a/apidocs/index-all.html
+++ b/apidocs/index-all.html
@@ -690,6 +690,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/mob/MobConstants.html#BULKLOAD_DIR_NAME">BULKLOAD_DIR_NAME</a></span> - Static variable in class org.apache.hadoop.hbase.mob.<a href="./org/apache/hadoop/hbase/mob/MobConstants.html" title="class in org.apache.hadoop.hbase.mob">MobConstants</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#BULKLOAD_MAX_RETRIES_NUMBER">BULKLOAD_MAX_RETRIES_NUMBER</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
+<dd>
+<div class="block">Maximum time to retry for a failed bulk load request</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#bulkLoadPhase(org.apache.hadoop.hbase.client.Table,%20org.apache.hadoop.hbase.client.Connection,%20java.util.concurrent.ExecutorService,%20java.util.Deque,%20com.google.common.collect.Multimap)">bulkLoadPhase(Table, Connection, ExecutorService, Deque&lt;LoadIncrementalHFiles.LoadQueueItem&gt;, Multimap&lt;ByteBuffer, LoadIncrementalHFiles.LoadQueueItem&gt;)</a></span> - Method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html" title="class in org.apache.hadoop.hbase.mapreduce">LoadIncrementalHFiles</a></dt>
 <dd>
 <div class="block">This takes the LQI's grouped by likely regions and attempts to bulk load
@@ -1823,6 +1827,16 @@
 <dd>
 <div class="block">Flatten the map of cells out under the CellScanner</div>
 </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String)">createClusterConf(Configuration, String)</a></span> - Static method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HBaseConfiguration.html" title="class in org.apache.hadoop.hbase">HBaseConfiguration</a></dt>
+<dd>
+<div class="block">Generates a <code>Configuration</code> instance by applying the ZooKeeper cluster key
+ to the base Configuration.</div>
+</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String)">createClusterConf(Configuration, String, String)</a></span> - Static method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HBaseConfiguration.html" title="class in org.apache.hadoop.hbase">HBaseConfiguration</a></dt>
+<dd>
+<div class="block">Generates a <code>Configuration</code> instance by applying property overrides prefixed by
+ a cluster profile key to the base Configuration.</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/filter/ParseFilter.html#createComparator(byte[])">createComparator(byte[])</a></span> - Static method in class org.apache.hadoop.hbase.filter.<a href="./org/apache/hadoop/hbase/filter/ParseFilter.html" title="class in org.apache.hadoop.hbase.filter">ParseFilter</a></dt>
 <dd>
 <div class="block">Parses a comparator of the form comparatorType:comparatorValue form and returns a comparator</div>
@@ -7202,6 +7216,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initCredentialsForCluster(org.apache.hadoop.mapreduce.Job,%20java.lang.String)">initCredentialsForCluster(Job, String)</a></span> - Static method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html" title="class in org.apache.hadoop.hbase.mapreduce">TableMapReduceUtil</a></dt>
 <dd>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>Since 1.2.0, use <a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initCredentialsForCluster(org.apache.hadoop.mapreduce.Job,%20org.apache.hadoop.conf.Configuration)"><code>TableMapReduceUtil.initCredentialsForCluster(Job, Configuration)</code></a> instead.</i></div>
+</div>
+</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initCredentialsForCluster(org.apache.hadoop.mapreduce.Job,%20org.apache.hadoop.conf.Configuration)">initCredentialsForCluster(Job, Configuration)</a></span> - Static method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html" title="class in org.apache.hadoop.hbase.mapreduce">TableMapReduceUtil</a></dt>
+<dd>
 <div class="block">Obtain an authentication token, for the specified cluster, on behalf of the current user
  and add it to the credentials for the given map reduce job.</div>
 </dd>
@@ -8244,6 +8264,10 @@
 </dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#LOAD_BALANCER_SLOP_KEY">LOAD_BALANCER_SLOP_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#loadHFileQueue(org.apache.hadoop.hbase.client.Table,%20org.apache.hadoop.hbase.client.Connection,%20java.util.Deque,%20org.apache.hadoop.hbase.util.Pair)">loadHFileQueue(Table, Connection, Deque&lt;LoadIncrementalHFiles.LoadQueueItem&gt;, Pair&lt;byte[][], byte[][]&gt;)</a></span> - Method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html" title="class in org.apache.hadoop.hbase.mapreduce">LoadIncrementalHFiles</a></dt>
+<dd>
+<div class="block">Used by the replication sink to load the hfiles from the source cluster.</div>
+</dd>
 <dt><a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html" title="class in org.apache.hadoop.hbase.mapreduce"><span class="strong">LoadIncrementalHFiles</span></a> - Class in <a href="./org/apache/hadoop/hbase/mapreduce/package-summary.html">org.apache.hadoop.hbase.mapreduce</a></dt>
 <dd>
 <div class="block">Tool to load the output of HFileOutputFormat into an existing table.</div>
@@ -9795,6 +9819,12 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/filter/PrefixFilter.html#PrefixFilter(byte[])">PrefixFilter(byte[])</a></span> - Constructor for class org.apache.hadoop.hbase.filter.<a href="./org/apache/hadoop/hbase/filter/PrefixFilter.html" title="class in org.apache.hadoop.hbase.filter">PrefixFilter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#prepareHFileQueue(org.apache.hadoop.fs.Path,%20org.apache.hadoop.hbase.client.Table,%20java.util.Deque,%20boolean)">prepareHFileQueue(Path, Table, Deque&lt;LoadIncrementalHFiles.LoadQueueItem&gt;, boolean)</a></span> - Method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html" title="class in org.apache.hadoop.hbase.mapreduce">LoadIncrementalHFiles</a></dt>
+<dd>
+<div class="block">Prepare a collection of <code>LoadIncrementalHFiles.LoadQueueItem</code> from list of source hfiles contained in the
+ passed directory and validates whether the prepared queue has all the valid table column
+ families in it.</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/HRegionInfo.html#prettyPrint(java.lang.String)">prettyPrint(String)</a></span> - Static method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a></dt>
 <dd>
 <div class="block">Use logging.</div>
@@ -10807,10 +10837,23 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/HBaseInterfaceAudience.html#REPLICATION">REPLICATION</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HBaseInterfaceAudience.html" title="class in org.apache.hadoop.hbase">HBaseInterfaceAudience</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#REPLICATION_BULKLOAD_ENABLE_DEFAULT">REPLICATION_BULKLOAD_ENABLE_DEFAULT</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#REPLICATION_BULKLOAD_ENABLE_KEY">REPLICATION_BULKLOAD_ENABLE_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#REPLICATION_CLUSTER_ID">REPLICATION_CLUSTER_ID</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
+<dd>
+<div class="block">Replication cluster id of source cluster which uniquely identifies itself with peer cluster</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#REPLICATION_CODEC_CONF_KEY">REPLICATION_CODEC_CONF_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
 <dd>
 <div class="block">Configuration key for setting replication codec class name</div>
 </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#REPLICATION_CONF_DIR">REPLICATION_CONF_DIR</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
+<dd>
+<div class="block">Directory where the source cluster file system client configuration are placed which is used by
+ sink cluster to copy HFiles from source cluster file system</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#REPLICATION_ENABLE_DEFAULT">REPLICATION_ENABLE_DEFAULT</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/HConstants.html#REPLICATION_ENABLE_KEY">REPLICATION_ENABLE_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
@@ -11498,6 +11541,10 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/rest/client/Response.html#setBody(byte[])">setBody(byte[])</a></span> - Method in class org.apache.hadoop.hbase.rest.client.<a href="./org/apache/hadoop/hbase/rest/client/Response.html" title="class in org.apache.hadoop.hbase.rest.client">Response</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html#setBulkToken(java.lang.String)">setBulkToken(String)</a></span> - Method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html" title="class in org.apache.hadoop.hbase.mapreduce">LoadIncrementalHFiles</a></dt>
+<dd>
+<div class="block">Called from replication sink, where it manages bulkToken(staging directory) by itself.</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/client/Get.html#setCacheBlocks(boolean)">setCacheBlocks(boolean)</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="./org/apache/hadoop/hbase/client/Get.html" title="class in org.apache.hadoop.hbase.client">Get</a></dt>
 <dd>
 <div class="block">Set whether blocks should be cached for this Get.</div>
@@ -12248,6 +12295,11 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 <dd>
 <div class="block">Set minimum and maximum versions to keep</div>
 </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/HBaseConfiguration.html#setWithPrefix(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.Iterable)">setWithPrefix(Configuration, String, Iterable&lt;Map.Entry&lt;String, String&gt;&gt;)</a></span> - Static method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HBaseConfiguration.html" title="class in org.apache.hadoop.hbase">HBaseConfiguration</a></dt>
+<dd>
+<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>
+</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/client/Table.html#setWriteBufferSize(long)">setWriteBufferSize(long)</a></span> - Method in interface org.apache.hadoop.hbase.client.<a href="./org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a></dt>
 <dd>
 <div class="block"><span class="strong">Deprecated.</span>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/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 39c476c..fcf6062 100644
--- a/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
+++ b/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
@@ -106,7 +106,7 @@
 <br>
 <pre>@InterfaceAudience.Public
 @InterfaceStability.Stable
-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>
@@ -170,6 +170,23 @@ extends org.apache.hadoop.conf.Configuration</pre>
 <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,
@@ -206,6 +223,15 @@ extends org.apache.hadoop.conf.Configuration</pre>
 </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,
             <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)</code>
@@ -248,7 +274,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>
@@ -261,7 +287,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>
@@ -281,7 +307,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()">
@@ -290,7 +316,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>
@@ -301,7 +327,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>
@@ -313,7 +339,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
@@ -326,7 +352,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",
@@ -335,13 +361,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>
@@ -351,7 +391,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>
@@ -374,7 +414,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>
@@ -387,13 +427,53 @@ 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="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