You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2016/07/25 16:02:27 UTC
[03/52] [partial] hbase-site git commit: Published site at
bdd7782f054a4740bb63f4d9781ffe083d51e4bf.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.Context.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.Context.html b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.Context.html
index 85ea186..bb78445 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.Context.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.Context.html
@@ -110,18 +110,18 @@
</tr>
<tbody>
<tr class="altColor">
-<td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><span class="strong">RpcScheduler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.html#init(org.apache.hadoop.hbase.ipc.RpcScheduler.Context)">init</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.Context.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler.Context</a> context)</code>
-<div class="block">Does some quick initialization.</div>
-</td>
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">SimpleRpcScheduler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.html#init(org.apache.hadoop.hbase.ipc.RpcScheduler.Context)">init</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.Context.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler.Context</a> context)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">FifoRpcScheduler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/FifoRpcScheduler.html#init(org.apache.hadoop.hbase.ipc.RpcScheduler.Context)">init</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.Context.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler.Context</a> context)</code> </td>
</tr>
<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">SimpleRpcScheduler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.html#init(org.apache.hadoop.hbase.ipc.RpcScheduler.Context)">init</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.Context.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler.Context</a> context)</code> </td>
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="strong">RpcScheduler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.html#init(org.apache.hadoop.hbase.ipc.RpcScheduler.Context)">init</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.Context.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler.Context</a> context)</code>
+<div class="block">Does some quick initialization.</div>
+</td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.html b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.html
index 8ca9280..061465c 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.html
@@ -205,14 +205,14 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler</a></code></td>
-<td class="colLast"><span class="strong">FifoRpcSchedulerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/FifoRpcSchedulerFactory.html#create(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.ipc.PriorityFunction)">create</a></strong>(org.apache.hadoop.conf.Configuration conf,
+<td class="colLast"><span class="strong">SimpleRpcSchedulerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SimpleRpcSchedulerFactory.html#create(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.ipc.PriorityFunction)">create</a></strong>(org.apache.hadoop.conf.Configuration conf,
<a href="../../../../../../org/apache/hadoop/hbase/ipc/PriorityFunction.html" title="interface in org.apache.hadoop.hbase.ipc">PriorityFunction</a> priority)</code>
<div class="block"><strong>Deprecated.</strong> </div>
</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler</a></code></td>
-<td class="colLast"><span class="strong">SimpleRpcSchedulerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SimpleRpcSchedulerFactory.html#create(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.ipc.PriorityFunction)">create</a></strong>(org.apache.hadoop.conf.Configuration conf,
+<td class="colLast"><span class="strong">FifoRpcSchedulerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/FifoRpcSchedulerFactory.html#create(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.ipc.PriorityFunction)">create</a></strong>(org.apache.hadoop.conf.Configuration conf,
<a href="../../../../../../org/apache/hadoop/hbase/ipc/PriorityFunction.html" title="interface in org.apache.hadoop.hbase.ipc">PriorityFunction</a> priority)</code>
<div class="block"><strong>Deprecated.</strong> </div>
</td>
@@ -227,13 +227,13 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler</a></code></td>
-<td class="colLast"><span class="strong">FifoRpcSchedulerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/FifoRpcSchedulerFactory.html#create(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.ipc.PriorityFunction,%20org.apache.hadoop.hbase.Abortable)">create</a></strong>(org.apache.hadoop.conf.Configuration conf,
+<td class="colLast"><span class="strong">SimpleRpcSchedulerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SimpleRpcSchedulerFactory.html#create(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.ipc.PriorityFunction,%20org.apache.hadoop.hbase.Abortable)">create</a></strong>(org.apache.hadoop.conf.Configuration conf,
<a href="../../../../../../org/apache/hadoop/hbase/ipc/PriorityFunction.html" title="interface in org.apache.hadoop.hbase.ipc">PriorityFunction</a> priority,
<a href="../../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface in org.apache.hadoop.hbase">Abortable</a> server)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcScheduler.html" title="class in org.apache.hadoop.hbase.ipc">RpcScheduler</a></code></td>
-<td class="colLast"><span class="strong">SimpleRpcSchedulerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SimpleRpcSchedulerFactory.html#create(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.ipc.PriorityFunction,%20org.apache.hadoop.hbase.Abortable)">create</a></strong>(org.apache.hadoop.conf.Configuration conf,
+<td class="colLast"><span class="strong">FifoRpcSchedulerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/FifoRpcSchedulerFactory.html#create(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.ipc.PriorityFunction,%20org.apache.hadoop.hbase.Abortable)">create</a></strong>(org.apache.hadoop.conf.Configuration conf,
<a href="../../../../../../org/apache/hadoop/hbase/ipc/PriorityFunction.html" title="interface in org.apache.hadoop.hbase.ipc">PriorityFunction</a> priority,
<a href="../../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface in org.apache.hadoop.hbase">Abortable</a> server)</code> </td>
</tr>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcServerInterface.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcServerInterface.html b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcServerInterface.html
index 97c8c1a..0d42775 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcServerInterface.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/RpcServerInterface.html
@@ -162,14 +162,14 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcServerInterface.html" title="interface in org.apache.hadoop.hbase.ipc">RpcServerInterface</a></code></td>
-<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getRpcServer()">getRpcServer</a></strong>()</code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcServerInterface.html" title="interface in org.apache.hadoop.hbase.ipc">RpcServerInterface</a></code></td>
<td class="colLast"><span class="strong">RegionServerServices.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html#getRpcServer()">getRpcServer</a></strong>()</code>
<div class="block">Returns a reference to the region server's RPC server</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcServerInterface.html" title="interface in org.apache.hadoop.hbase.ipc">RpcServerInterface</a></code></td>
+<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getRpcServer()">getRpcServer</a></strong>()</code> </td>
+</tr>
</tbody>
</table>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/ipc/class-use/StoppedRpcClientException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/StoppedRpcClientException.html b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/StoppedRpcClientException.html
index 9f6fe45..05d70e1 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/StoppedRpcClientException.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/StoppedRpcClientException.html
@@ -106,17 +106,17 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/AsyncRpcChannel.html" title="interface in org.apache.hadoop.hbase.ipc">AsyncRpcChannel</a></code></td>
-<td class="colLast"><span class="strong">RpcClient.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#createRpcChannel(java.lang.String,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User)">createRpcChannel</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> serviceName,
+<td class="colLast"><span class="strong">AsyncRpcClient.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/AsyncRpcClient.html#createRpcChannel(java.lang.String,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User)">createRpcChannel</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> serviceName,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> sn,
- <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)</code>
-<div class="block">Create or fetch AsyncRpcChannel</div>
-</td>
+ <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/AsyncRpcChannel.html" title="interface in org.apache.hadoop.hbase.ipc">AsyncRpcChannel</a></code></td>
-<td class="colLast"><span class="strong">AsyncRpcClient.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/AsyncRpcClient.html#createRpcChannel(java.lang.String,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User)">createRpcChannel</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> serviceName,
+<td class="colLast"><span class="strong">RpcClient.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#createRpcChannel(java.lang.String,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User)">createRpcChannel</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> serviceName,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> sn,
- <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)</code> </td>
+ <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)</code>
+<div class="block">Create or fetch AsyncRpcChannel</div>
+</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/ipc/AsyncRpcChannel.html" title="interface in org.apache.hadoop.hbase.ipc">AsyncRpcChannel</a></code></td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/CellCreator.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/CellCreator.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/CellCreator.html
index b476d76..c4bdc72 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/CellCreator.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/CellCreator.html
@@ -99,15 +99,15 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<tbody>
<tr class="altColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a></code></td>
-<td class="colLast"><span class="strong">TextSortReducer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TextSortReducer.html#kvCreator">kvCreator</a></strong></code> </td>
+<td class="colLast"><span class="strong">PutSortReducer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/PutSortReducer.html#kvCreator">kvCreator</a></strong></code> </td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a></code></td>
-<td class="colLast"><span class="strong">TsvImporterMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#kvCreator">kvCreator</a></strong></code> </td>
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a></code></td>
+<td class="colLast"><span class="strong">TextSortReducer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TextSortReducer.html#kvCreator">kvCreator</a></strong></code> </td>
</tr>
<tr class="altColor">
-<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a></code></td>
-<td class="colLast"><span class="strong">PutSortReducer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/PutSortReducer.html#kvCreator">kvCreator</a></strong></code> </td>
+<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a></code></td>
+<td class="colLast"><span class="strong">TsvImporterMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#kvCreator">kvCreator</a></strong></code> </td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/ImportTsv.TsvParser.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/ImportTsv.TsvParser.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/ImportTsv.TsvParser.html
index 8037a68..e04e03a 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/ImportTsv.TsvParser.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/ImportTsv.TsvParser.html
@@ -102,13 +102,13 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<td class="colLast"><span class="strong">TextSortReducer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TextSortReducer.html#parser">parser</a></strong></code> </td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser</a></code></td>
-<td class="colLast"><span class="strong">TsvImporterTextMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#parser">parser</a></strong></code> </td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser</a></code></td>
<td class="colLast"><span class="strong">TsvImporterMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#parser">parser</a></strong></code> </td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser</a></code></td>
+<td class="colLast"><span class="strong">TsvImporterTextMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html#parser">parser</a></strong></code> </td>
+</tr>
</tbody>
</table>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableRecordReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableRecordReader.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableRecordReader.html
index c87bab5..d0f7aff 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableRecordReader.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableRecordReader.html
@@ -99,13 +99,13 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<tbody>
<tr class="altColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce">TableRecordReader</a></code></td>
-<td class="colLast"><span class="strong">MultiTableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#tableRecordReader">tableRecordReader</a></strong></code>
+<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#tableRecordReader">tableRecordReader</a></strong></code>
<div class="block">The reader scanning the table, can be a custom one.</div>
</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce">TableRecordReader</a></code></td>
-<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#tableRecordReader">tableRecordReader</a></strong></code>
+<td class="colLast"><span class="strong">MultiTableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#tableRecordReader">tableRecordReader</a></strong></code>
<div class="block">The reader scanning the table, can be a custom one.</div>
</td>
</tr>
@@ -120,13 +120,13 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<tbody>
<tr class="altColor">
<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><span class="strong">MultiTableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#setTableRecordReader(org.apache.hadoop.hbase.mapreduce.TableRecordReader)">setTableRecordReader</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce">TableRecordReader</a> tableRecordReader)</code>
+<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#setTableRecordReader(org.apache.hadoop.hbase.mapreduce.TableRecordReader)">setTableRecordReader</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce">TableRecordReader</a> tableRecordReader)</code>
<div class="block">Allows subclasses to set the <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce"><code>TableRecordReader</code></a>.</div>
</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#setTableRecordReader(org.apache.hadoop.hbase.mapreduce.TableRecordReader)">setTableRecordReader</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce">TableRecordReader</a> tableRecordReader)</code>
+<td class="colLast"><span class="strong">MultiTableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.html#setTableRecordReader(org.apache.hadoop.hbase.mapreduce.TableRecordReader)">setTableRecordReader</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce">TableRecordReader</a> tableRecordReader)</code>
<div class="block">Allows subclasses to set the <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce"><code>TableRecordReader</code></a>.</div>
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.InputSplit.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.InputSplit.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.InputSplit.html
index f199933..f53c343 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.InputSplit.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.InputSplit.html
@@ -151,16 +151,16 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.InputSplit.html" title="class in org.apache.hadoop.hbase.mapreduce">TableSnapshotInputFormatImpl.InputSplit</a>></code></td>
+<td class="colLast"><span class="strong">TableSnapshotInputFormatImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.html#getSplits(org.apache.hadoop.conf.Configuration)">getSplits</a></strong>(org.apache.hadoop.conf.Configuration conf)</code> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.InputSplit.html" title="class in org.apache.hadoop.hbase.mapreduce">TableSnapshotInputFormatImpl.InputSplit</a>></code></td>
<td class="colLast"><span class="strong">MultiTableSnapshotInputFormatImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/MultiTableSnapshotInputFormatImpl.html#getSplits(org.apache.hadoop.conf.Configuration)">getSplits</a></strong>(org.apache.hadoop.conf.Configuration conf)</code>
<div class="block">Return the list of splits extracted from the scans/snapshots pushed to conf by
<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/MultiTableSnapshotInputFormatImpl.html#setInput(org.apache.hadoop.conf.Configuration,%20java.util.Map,%20org.apache.hadoop.fs.Path)"><code>MultiTableSnapshotInputFormatImpl.setInput(org.apache.hadoop.conf.Configuration, java.util.Map, org.apache.hadoop.fs.Path)</code></a></div>
</td>
</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.InputSplit.html" title="class in org.apache.hadoop.hbase.mapreduce">TableSnapshotInputFormatImpl.InputSplit</a>></code></td>
-<td class="colLast"><span class="strong">TableSnapshotInputFormatImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.html#getSplits(org.apache.hadoop.conf.Configuration)">getSplits</a></strong>(org.apache.hadoop.conf.Configuration conf)</code> </td>
-</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.InputSplit.html" title="class in org.apache.hadoop.hbase.mapreduce">TableSnapshotInputFormatImpl.InputSplit</a>></code></td>
<td class="colLast"><span class="strong">TableSnapshotInputFormatImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.html#getSplits(org.apache.hadoop.hbase.client.Scan,%20org.apache.hadoop.hbase.snapshot.SnapshotManifest,%20java.util.List,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.conf.Configuration)">getSplits</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan,
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index ca6c723..473df98 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -269,10 +269,10 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">RowCounter.RowCounterMapper.Counters</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">TableSplit.Version</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">SyncTable.SyncMapper.Counter</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">CellCounter.CellCounterMapper.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">RowCounter.RowCounterMapper.Counters</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/mapreduce/package-use.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-use.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-use.html
index 29e138a..4b632ee 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-use.html
@@ -113,6 +113,16 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tbody>
<tr class="altColor">
+<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/MultiTableSnapshotInputFormatImpl.html#org.apache.hadoop.hbase.mapred">MultiTableSnapshotInputFormatImpl</a>
+<div class="block">Shared implementation of mapreduce code over multiple table snapshots.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.InputSplit.html#org.apache.hadoop.hbase.mapred">TableSnapshotInputFormatImpl.InputSplit</a>
+<div class="block">Implementation class for InputSplit logic common between mapred and mapreduce.</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.RecordReader.html#org.apache.hadoop.hbase.mapred">TableSnapshotInputFormatImpl.RecordReader</a>
<div class="block">Implementation class for RecordReader logic common between mapred and mapreduce.</div>
</td>
@@ -183,84 +193,79 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</td>
</tr>
<tr class="rowColor">
-<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/MultiTableSnapshotInputFormatImpl.html#org.apache.hadoop.hbase.mapreduce">MultiTableSnapshotInputFormatImpl</a>
-<div class="block">Shared implementation of mapreduce code over multiple table snapshots.</div>
-</td>
-</tr>
-<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/RowCounter.RowCounterMapper.Counters.html#org.apache.hadoop.hbase.mapreduce">RowCounter.RowCounterMapper.Counters</a>
<div class="block">Counter enumeration to count the actual rows.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/SyncTable.SyncMapper.CellScanner.html#org.apache.hadoop.hbase.mapreduce">SyncTable.SyncMapper.CellScanner</a> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/SyncTable.SyncMapper.Counter.html#org.apache.hadoop.hbase.mapreduce">SyncTable.SyncMapper.Counter</a> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableInputFormatBase.html#org.apache.hadoop.hbase.mapreduce">TableInputFormatBase</a>
<div class="block">A base for <a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormat.html" title="class in org.apache.hadoop.hbase.mapreduce"><code>TableInputFormat</code></a>s.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableMapper.html#org.apache.hadoop.hbase.mapreduce">TableMapper</a>
<div class="block">Extends the base <code>Mapper</code> class to add the required input key
and value classes.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableRecordReader.html#org.apache.hadoop.hbase.mapreduce">TableRecordReader</a>
<div class="block">Iterate over an HBase table data, return (ImmutableBytesWritable, Result)
pairs.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableRecordReaderImpl.html#org.apache.hadoop.hbase.mapreduce">TableRecordReaderImpl</a>
<div class="block">Iterate over an HBase table data, return (ImmutableBytesWritable, Result)
pairs.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableReducer.html#org.apache.hadoop.hbase.mapreduce">TableReducer</a>
<div class="block">Extends the basic <code>Reducer</code> class to add the required key and
value input/output classes.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormat.html#org.apache.hadoop.hbase.mapreduce">TableSnapshotInputFormat</a>
<div class="block">TableSnapshotInputFormat allows a MapReduce job to run over a table snapshot.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.InputSplit.html#org.apache.hadoop.hbase.mapreduce">TableSnapshotInputFormatImpl.InputSplit</a>
<div class="block">Implementation class for InputSplit logic common between mapred and mapreduce.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableSnapshotInputFormatImpl.RecordReader.html#org.apache.hadoop.hbase.mapreduce">TableSnapshotInputFormatImpl.RecordReader</a>
<div class="block">Implementation class for RecordReader logic common between mapred and mapreduce.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableSplit.html#org.apache.hadoop.hbase.mapreduce">TableSplit</a>
<div class="block">A table split corresponds to a key range (low, high) and an optional scanner.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableSplit.Version.html#org.apache.hadoop.hbase.mapreduce">TableSplit.Version</a> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/VisibilityExpressionResolver.html#org.apache.hadoop.hbase.mapreduce">VisibilityExpressionResolver</a>
<div class="block">Interface to convert visibility expressions into Tags for storing along with Cells in HFiles.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/WALInputFormat.html#org.apache.hadoop.hbase.mapreduce">WALInputFormat</a>
<div class="block">Simple <code>InputFormat</code> for <a href="../../../../../org/apache/hadoop/hbase/wal/WAL.html" title="interface in org.apache.hadoop.hbase.wal"><code>WAL</code></a> files.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/WALInputFormat.WALRecordReader.html#org.apache.hadoop.hbase.mapreduce">WALInputFormat.WALRecordReader</a>
<div class="block"><code>RecordReader</code> for an <code>WAL</code> file.</div>
</td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
index 6f41a1d..8feec5c 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
@@ -103,7 +103,7 @@
</dl>
<hr>
<br>
-<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.300">CatalogJanitor.SplitParentFirstComparator</a>
+<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.311">CatalogJanitor.SplitParentFirstComparator</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
implements <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>></pre>
<div class="block">Compare HRegionInfos in a way that has split parents sort BEFORE their
@@ -202,7 +202,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Comparato
<ul class="blockListLast">
<li class="blockList">
<h4>rowEndKeyComparator</h4>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a><byte[]> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html#line.301">rowEndKeyComparator</a></pre>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a><byte[]> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html#line.312">rowEndKeyComparator</a></pre>
</li>
</ul>
</li>
@@ -219,7 +219,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Comparato
<ul class="blockListLast">
<li class="blockList">
<h4>CatalogJanitor.SplitParentFirstComparator</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html#line.300">CatalogJanitor.SplitParentFirstComparator</a>()</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html#line.311">CatalogJanitor.SplitParentFirstComparator</a>()</pre>
</li>
</ul>
</li>
@@ -236,7 +236,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Comparato
<ul class="blockListLast">
<li class="blockList">
<h4>compare</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html#line.303">compare</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> left,
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html#line.314">compare</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> left,
<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> right)</pre>
<dl>
<dt><strong>Specified by:</strong></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html
index 1927fd2..fc16cf3 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html
@@ -450,7 +450,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>getMergedRegionsAndSplitParents</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/util/Triple.html" title="class in org.apache.hadoop.hbase.util">Triple</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" ti
tle="class in org.apache.hadoop.hbase.client">Result</a>>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.132">getMergedRegionsAndSplitParents</a>()
+<pre><a href="../../../../../org/apache/hadoop/hbase/util/Triple.html" title="class in org.apache.hadoop.hbase.util">Triple</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" ti
tle="class in org.apache.hadoop.hbase.client">Result</a>>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.133">getMergedRegionsAndSplitParents</a>()
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">Scans hbase:meta and returns a number of scanned rows, and a map of merged
regions, and an ordered map of split parents.</div>
@@ -466,7 +466,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>getMergedRegionsAndSplitParents</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/util/Triple.html" title="class in org.apache.hadoop.hbase.util">Triple</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" ti
tle="class in org.apache.hadoop.hbase.client">Result</a>>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.147">getMergedRegionsAndSplitParents</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)
+<pre><a href="../../../../../org/apache/hadoop/hbase/util/Triple.html" title="class in org.apache.hadoop.hbase.util">Triple</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" ti
tle="class in org.apache.hadoop.hbase.client">Result</a>>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.148">getMergedRegionsAndSplitParents</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)
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">Scans hbase:meta and returns a number of scanned rows, and a map of merged
regions, and an ordered map of split parents. if the given table name is
@@ -485,7 +485,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>cleanMergeRegion</h4>
-<pre>boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.197">cleanMergeRegion</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> mergedRegion,
+<pre>boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.198">cleanMergeRegion</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> mergedRegion,
<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> regionA,
<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> regionB)
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>
@@ -504,7 +504,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>scan</h4>
-<pre>int <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.229">scan</a>()
+<pre>int <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.230">scan</a>()
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">Run janitorial scan of catalog <code>hbase:meta</code> table looking for
garbage to collect.</div>
@@ -519,7 +519,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>cleanParent</h4>
-<pre>boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.330">cleanParent</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> parent,
+<pre>boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.341">cleanParent</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> parent,
<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> rowContent)
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">If daughters no longer hold reference to the parents, delete the parent.</div>
@@ -537,7 +537,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>hasNoReferences</h4>
-<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.363">hasNoReferences</a>(<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>> p)</pre>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.374">hasNoReferences</a>(<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>> p)</pre>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>p</code> - A pair where the first boolean says whether or not the daughter
region directory exists in the filesystem and then the second boolean says
whether the daughter has references to the parent.</dd>
@@ -550,7 +550,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>checkDaughterInFs</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.377">checkDaughterInFs</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> parent,
+<pre><a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.388">checkDaughterInFs</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> parent,
<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> daughter)
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">Checks if a daughter region -- either splitA or splitB -- still holds
@@ -569,7 +569,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>getTableDescriptor</h4>
-<pre>private <a href="../../../../../org/apache/hadoop/hbase/HTableDescriptor.html" title="class in org.apache.hadoop.hbase">HTableDescriptor</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.420">getTableDescriptor</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)
+<pre>private <a href="../../../../../org/apache/hadoop/hbase/HTableDescriptor.html" title="class in org.apache.hadoop.hbase">HTableDescriptor</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.431">getTableDescriptor</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/FileNotFoundException.html?is-external=true" title="class or interface in java.io">FileNotFoundException</a>,
<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>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -583,7 +583,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockListLast">
<li class="blockList">
<h4>cleanMergeQualifier</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.432">cleanMergeQualifier</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> region)
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.443">cleanMergeQualifier</a>(<a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> region)
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">Checks if the specified region has merge qualifiers, if so, try to clean
them</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html b/devapidocs/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
index 1745919..6e94000 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
@@ -108,7 +108,7 @@
</dl>
<hr>
<br>
-<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.197">HMaster.InitializationMonitor</a>
+<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.199">HMaster.InitializationMonitor</a>
extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" title="class in org.apache.hadoop.hbase.util">HasThread</a></pre>
<div class="block">Protection against zombie master. Started once Master accepts active responsibility and
starts taking over responsibilities. Allows a finite time window before giving up ownership.</div>
@@ -236,7 +236,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockList">
<li class="blockList">
<h4>TIMEOUT_KEY</h4>
-<pre>public static final <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="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.199">TIMEOUT_KEY</a></pre>
+<pre>public static final <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="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.201">TIMEOUT_KEY</a></pre>
<div class="block">The amount of time in milliseconds to sleep before checking initialization status.</div>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.master.HMaster.InitializationMonitor.TIMEOUT_KEY">Constant Field Values</a></dd></dl>
</li>
@@ -247,7 +247,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockList">
<li class="blockList">
<h4>TIMEOUT_DEFAULT</h4>
-<pre>public static final long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.200">TIMEOUT_DEFAULT</a></pre>
+<pre>public static final long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.202">TIMEOUT_DEFAULT</a></pre>
</li>
</ul>
<a name="HALT_KEY">
@@ -256,7 +256,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockList">
<li class="blockList">
<h4>HALT_KEY</h4>
-<pre>public static final <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="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.206">HALT_KEY</a></pre>
+<pre>public static final <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="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.208">HALT_KEY</a></pre>
<div class="block">When timeout expired and initialization has not complete, call <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/System.html?is-external=true#exit(int)" title="class or interface in java.lang"><code>System.exit(int)</code></a> when
true, do nothing otherwise.</div>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.master.HMaster.InitializationMonitor.HALT_KEY">Constant Field Values</a></dd></dl>
@@ -268,7 +268,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockList">
<li class="blockList">
<h4>HALT_DEFAULT</h4>
-<pre>public static final boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.207">HALT_DEFAULT</a></pre>
+<pre>public static final boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.209">HALT_DEFAULT</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.master.HMaster.InitializationMonitor.HALT_DEFAULT">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -278,7 +278,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockList">
<li class="blockList">
<h4>master</h4>
-<pre>private final <a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.209">master</a></pre>
+<pre>private final <a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.211">master</a></pre>
</li>
</ul>
<a name="timeout">
@@ -287,7 +287,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockList">
<li class="blockList">
<h4>timeout</h4>
-<pre>private final long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.210">timeout</a></pre>
+<pre>private final long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.212">timeout</a></pre>
</li>
</ul>
<a name="haltOnTimeout">
@@ -296,7 +296,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockListLast">
<li class="blockList">
<h4>haltOnTimeout</h4>
-<pre>private final boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.211">haltOnTimeout</a></pre>
+<pre>private final boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.213">haltOnTimeout</a></pre>
</li>
</ul>
</li>
@@ -313,7 +313,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockListLast">
<li class="blockList">
<h4>HMaster.InitializationMonitor</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.214">HMaster.InitializationMonitor</a>(<a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> master)</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.216">HMaster.InitializationMonitor</a>(<a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> master)</pre>
<div class="block">Creates a Thread that monitors the <a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html#isInitialized()"><code>HMaster.isInitialized()</code></a> state.</div>
</li>
</ul>
@@ -331,7 +331,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" tit
<ul class="blockListLast">
<li class="blockList">
<h4>run</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.223">run</a>()</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html#line.225">run</a>()</pre>
<dl>
<dt><strong>Specified by:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true#run()" title="class or interface in java.lang">run</a></code> in interface <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html b/devapidocs/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html
index bd72ba3..536ec7c 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html
@@ -108,7 +108,7 @@
</dl>
<hr>
<br>
-<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.371">HMaster.PeriodicDoMetrics</a>
+<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.376">HMaster.PeriodicDoMetrics</a>
extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" title="class in org.apache.hadoop.hbase">ScheduledChore</a></pre>
</li>
</ul>
@@ -206,7 +206,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockListLast">
<li class="blockList">
<h4>server</h4>
-<pre>private final <a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html#line.372">server</a></pre>
+<pre>private final <a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html#line.377">server</a></pre>
</li>
</ul>
</li>
@@ -223,7 +223,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockListLast">
<li class="blockList">
<h4>HMaster.PeriodicDoMetrics</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html#line.373">HMaster.PeriodicDoMetrics</a>(int doMetricsInterval,
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html#line.378">HMaster.PeriodicDoMetrics</a>(int doMetricsInterval,
<a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> server)</pre>
</li>
</ul>
@@ -241,7 +241,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockListLast">
<li class="blockList">
<h4>chore</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html#line.379">chore</a>()</pre>
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.PeriodicDoMetrics.html#line.384">chore</a>()</pre>
<div class="block"><strong>Description copied from class: <code><a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html#chore()">ScheduledChore</a></code></strong></div>
<div class="block">The task to execute on each scheduled execution of the Chore</div>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/devapidocs/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html b/devapidocs/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
index 549e223..5217a50 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
@@ -113,7 +113,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.357">HMaster.RedirectServlet</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.362">HMaster.RedirectServlet</a>
extends javax.servlet.http.HttpServlet</pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../serialized-form.html#org.apache.hadoop.hbase.master.HMaster.RedirectServlet">Serialized Form</a></dd></dl>
</li>
@@ -221,7 +221,7 @@ extends javax.servlet.http.HttpServlet</pre>
<ul class="blockList">
<li class="blockList">
<h4>serialVersionUID</h4>
-<pre>private static final long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html#line.358">serialVersionUID</a></pre>
+<pre>private static final long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html#line.363">serialVersionUID</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.master.HMaster.RedirectServlet.serialVersionUID">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -231,7 +231,7 @@ extends javax.servlet.http.HttpServlet</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>regionServerInfoPort</h4>
-<pre>private static int <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html#line.359">regionServerInfoPort</a></pre>
+<pre>private static int <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html#line.364">regionServerInfoPort</a></pre>
</li>
</ul>
</li>
@@ -248,7 +248,7 @@ extends javax.servlet.http.HttpServlet</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>HMaster.RedirectServlet</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html#line.357">HMaster.RedirectServlet</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html#line.362">HMaster.RedirectServlet</a>()</pre>
</li>
</ul>
</li>
@@ -265,7 +265,7 @@ extends javax.servlet.http.HttpServlet</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>doGet</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html#line.362">doGet</a>(javax.servlet.http.HttpServletRequest request,
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html#line.367">doGet</a>(javax.servlet.http.HttpServletRequest request,
javax.servlet.http.HttpServletResponse response)
throws javax.servlet.ServletException,
<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>