http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
index 2afe456..fef50f3 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
@@ -118,7 +118,9 @@
 </li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/ConnectionId.html" 
title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">ConnectionId</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/CoprocessorRpcUtils.html" 
title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">CoprocessorRpcUtils</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/DelegatingHBaseRpcController.html"
 title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">DelegatingHBaseRpcController</span></a> (implements 
org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in org.apache.hadoop.hbase.ipc">HBaseRpcController</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/FailedServers.html" 
title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">FailedServers</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcControllerImpl.html" 
title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">HBaseRpcControllerImpl</span></a> (implements 
org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in org.apache.hadoop.hbase.ipc">HBaseRpcController</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/IPCUtil.html" title="class in 
org.apache.hadoop.hbase.ipc"><span class="strong">IPCUtil</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServer.html" 
title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">MetricsHBaseServer</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactory.html"
 title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">MetricsHBaseServerSourceFactory</span></a>
@@ -127,11 +129,6 @@
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.html"
 title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">MetricsHBaseServerWrapperImpl</span></a> (implements 
org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.html"
 title="interface in 
org.apache.hadoop.hbase.ipc">MetricsHBaseServerWrapper</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">PayloadCarryingRpcController</span></a> (implements 
org.apache.hadoop.hbase.<a 
href="../../../../../org/apache/hadoop/hbase/CellScannable.html" 
title="interface in org.apache.hadoop.hbase">CellScannable</a>, 
com.google.protobuf.RpcController)
-<ul>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/DelegatingPayloadCarryingRpcController.html"
 title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">DelegatingPayloadCarryingRpcController</span></a></li>
-</ul>
-</li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClientFactory.html" 
title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">RpcClientFactory</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClientImpl.CallFuture.html" 
title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">RpcClientImpl.CallFuture</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcControllerFactory.html" 
title="class in org.apache.hadoop.hbase.ipc"><span 
class="strong">RpcControllerFactory</span></a></li>
@@ -254,6 +251,12 @@
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html" 
title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">CoprocessorRpcChannel</span></a> (also extends 
com.google.protobuf.RpcChannel)</li>
 </ul>
 </li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../../org/apache/hadoop/hbase/CellScannable.html" 
title="interface in org.apache.hadoop.hbase"><span 
class="strong">CellScannable</span></a>
+<ul>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">HBaseRpcController</span></a> (also extends 
com.google.protobuf.RpcController)</li>
+</ul>
+</li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.CancellationCallback.html"
 title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">HBaseRpcController.CancellationCallback</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRPCErrorHandler.html" 
title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">HBaseRPCErrorHandler</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/IOExceptionConverter.html" 
title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">IOExceptionConverter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/MessageConverter.html" 
title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">MessageConverter</span></a>&lt;M,O&gt;</li>
@@ -266,6 +269,11 @@
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html" 
title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">CoprocessorRpcChannel</span></a> (also extends 
com.google.protobuf.BlockingRpcChannel)</li>
 </ul>
 </li>
+<li type="circle">com.google.protobuf.RpcController
+<ul>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">HBaseRpcController</span></a> (also extends 
org.apache.hadoop.hbase.<a 
href="../../../../../org/apache/hadoop/hbase/CellScannable.html" 
title="interface in org.apache.hadoop.hbase">CellScannable</a>)</li>
+</ul>
+</li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcServerInterface.html" 
title="interface in org.apache.hadoop.hbase.ipc"><span 
class="strong">RpcServerInterface</span></a></li>
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/devapidocs/org/apache/hadoop/hbase/ipc/package-use.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-use.html 
b/devapidocs/org/apache/hadoop/hbase/ipc/package-use.html
index 7492116..caf346c 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-use.html
@@ -148,7 +148,7 @@ 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/ipc/class-use/PayloadCarryingRpcController.html#org.apache.hadoop.hbase.client">PayloadCarryingRpcController</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/HBaseRpcController.html#org.apache.hadoop.hbase.client">HBaseRpcController</a>
 <div class="block">Optionally carries Cells across the proxy/service interface 
down into ipc.</div>
 </td>
 </tr>
@@ -159,7 +159,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcControllerFactory.html#org.apache.hadoop.hbase.client">RpcControllerFactory</a>
-<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>PayloadCarryingRpcController</code></a></div>
+<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc"><code>HBaseRpcController</code></a></div>
 </td>
 </tr>
 </tbody>
@@ -251,6 +251,14 @@ 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/ipc/class-use/HBaseRpcController.html#org.apache.hadoop.hbase.ipc">HBaseRpcController</a>
+<div class="block">Optionally carries Cells across the proxy/service interface 
down into ipc.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/HBaseRpcController.CancellationCallback.html#org.apache.hadoop.hbase.ipc">HBaseRpcController.CancellationCallback</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/HBaseRPCErrorHandler.html#org.apache.hadoop.hbase.ipc">HBaseRPCErrorHandler</a>
 <div class="block">An interface for calling out of RPC for error 
conditions.</div>
 </td>
@@ -281,114 +289,109 @@ Input/OutputFormats, a table indexing MapReduce job, 
and utility methods.</div>
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/MetricsHBaseServerWrapper.html#org.apache.hadoop.hbase.ipc">MetricsHBaseServerWrapper</a>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/PayloadCarryingRpcController.html#org.apache.hadoop.hbase.ipc">PayloadCarryingRpcController</a>
-<div class="block">Optionally carries Cells across the proxy/service interface 
down into ipc.</div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/PriorityFunction.html#org.apache.hadoop.hbase.ipc">PriorityFunction</a>
 <div class="block">Function to figure priority of incoming request.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcCallback.html#org.apache.hadoop.hbase.ipc">RpcCallback</a>
 <div class="block">Denotes a callback action that has to be executed at the 
end of an Rpc Call.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcCallContext.html#org.apache.hadoop.hbase.ipc">RpcCallContext</a>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcClient.html#org.apache.hadoop.hbase.ipc">RpcClient</a>
 <div class="block">Interface for RpcClient implementations so 
ConnectionManager can handle it.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcClientImpl.CallFuture.html#org.apache.hadoop.hbase.ipc">RpcClientImpl.CallFuture</a>
 <div class="block">see <a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClientImpl.Connection.CallSender.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>RpcClientImpl.Connection.CallSender</code></a></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcClientImpl.Connection.html#org.apache.hadoop.hbase.ipc">RpcClientImpl.Connection</a>
 <div class="block">Thread that reads responses and notifies callers.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcClientImpl.Connection.CallSender.html#org.apache.hadoop.hbase.ipc">RpcClientImpl.Connection.CallSender</a>
 <div class="block">If the client wants to interrupt its calls easily 
(i.e.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcControllerFactory.html#org.apache.hadoop.hbase.ipc">RpcControllerFactory</a>
-<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>PayloadCarryingRpcController</code></a></div>
+<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc"><code>HBaseRpcController</code></a></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcExecutor.html#org.apache.hadoop.hbase.ipc">RpcExecutor</a>
 <div class="block">Runs the CallRunners passed here via <a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcExecutor.html#dispatch(org.apache.hadoop.hbase.ipc.CallRunner)"><code>RpcExecutor.dispatch(CallRunner)</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcExecutor.Handler.html#org.apache.hadoop.hbase.ipc">RpcExecutor.Handler</a>
 <div class="block">Handler thread run the <a 
href="../../../../../org/apache/hadoop/hbase/ipc/CallRunner.html#run()"><code>CallRunner.run()</code></a>
 in.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcExecutor.QueueBalancer.html#org.apache.hadoop.hbase.ipc">RpcExecutor.QueueBalancer</a>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.html#org.apache.hadoop.hbase.ipc">RpcScheduler</a>
 <div class="block">An interface for RPC request scheduling algorithm.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcScheduler.Context.html#org.apache.hadoop.hbase.ipc">RpcScheduler.Context</a>
 <div class="block">Exposes runtime information of a <code>RpcServer</code> 
that a <code>RpcScheduler</code> may need.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServer.html#org.apache.hadoop.hbase.ipc">RpcServer</a>
 <div class="block">An RPC server that hosts protobuf described Services.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServer.BlockingServiceAndInterface.html#org.apache.hadoop.hbase.ipc">RpcServer.BlockingServiceAndInterface</a>
 <div class="block">Datastructure for passing a <code>BlockingService</code> 
and its associated class of
  protobuf service interface.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServer.Call.html#org.apache.hadoop.hbase.ipc">RpcServer.Call</a>
 <div class="block">Datastructure that holds all necessary to a method 
invocation and then afterward, carries
  the result.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServer.Connection.html#org.apache.hadoop.hbase.ipc">RpcServer.Connection</a>
 <div class="block">Reads calls from a connection and queues them for 
handling.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServer.ConnectionManager.html#org.apache.hadoop.hbase.ipc">RpcServer.ConnectionManager</a>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServer.Listener.html#org.apache.hadoop.hbase.ipc">RpcServer.Listener</a>
 <div class="block">Listens on the socket.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServer.Listener.Reader.html#org.apache.hadoop.hbase.ipc">RpcServer.Listener.Reader</a>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServer.Responder.html#org.apache.hadoop.hbase.ipc">RpcServer.Responder</a>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcServerInterface.html#org.apache.hadoop.hbase.ipc">RpcServerInterface</a>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/StoppedRpcClientException.html#org.apache.hadoop.hbase.ipc">StoppedRpcClientException</a>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/SyncCoprocessorRpcChannel.html#org.apache.hadoop.hbase.ipc">SyncCoprocessorRpcChannel</a>
 <div class="block">Base class which provides clients with an RPC connection to
  call coprocessor endpoint <code>Service</code>s.</div>
@@ -408,7 +411,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcControllerFactory.html#org.apache.hadoop.hbase.mapreduce">RpcControllerFactory</a>
-<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>PayloadCarryingRpcController</code></a></div>
+<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc"><code>HBaseRpcController</code></a></div>
 </td>
 </tr>
 </tbody>
@@ -424,13 +427,13 @@ 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/ipc/class-use/HBaseRPCErrorHandler.html#org.apache.hadoop.hbase.master">HBaseRPCErrorHandler</a>
-<div class="block">An interface for calling out of RPC for error 
conditions.</div>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/HBaseRpcController.html#org.apache.hadoop.hbase.master">HBaseRpcController</a>
+<div class="block">Optionally carries Cells across the proxy/service interface 
down into ipc.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/PayloadCarryingRpcController.html#org.apache.hadoop.hbase.master">PayloadCarryingRpcController</a>
-<div class="block">Optionally carries Cells across the proxy/service interface 
down into ipc.</div>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/HBaseRPCErrorHandler.html#org.apache.hadoop.hbase.master">HBaseRPCErrorHandler</a>
+<div class="block">An interface for calling out of RPC for error 
conditions.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -446,7 +449,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 </tr>
 <tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcControllerFactory.html#org.apache.hadoop.hbase.master">RpcControllerFactory</a>
-<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>PayloadCarryingRpcController</code></a></div>
+<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc"><code>HBaseRpcController</code></a></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -488,13 +491,13 @@ 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/ipc/class-use/HBaseRPCErrorHandler.html#org.apache.hadoop.hbase.regionserver">HBaseRPCErrorHandler</a>
-<div class="block">An interface for calling out of RPC for error 
conditions.</div>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/HBaseRpcController.html#org.apache.hadoop.hbase.regionserver">HBaseRpcController</a>
+<div class="block">Optionally carries Cells across the proxy/service interface 
down into ipc.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/PayloadCarryingRpcController.html#org.apache.hadoop.hbase.regionserver">PayloadCarryingRpcController</a>
-<div class="block">Optionally carries Cells across the proxy/service interface 
down into ipc.</div>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/HBaseRPCErrorHandler.html#org.apache.hadoop.hbase.regionserver">HBaseRPCErrorHandler</a>
+<div class="block">An interface for calling out of RPC for error 
conditions.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -523,7 +526,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcControllerFactory.html#org.apache.hadoop.hbase.regionserver">RpcControllerFactory</a>
-<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>PayloadCarryingRpcController</code></a></div>
+<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc"><code>HBaseRpcController</code></a></div>
 </td>
 </tr>
 <tr class="altColor">
@@ -554,7 +557,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcControllerFactory.html#org.apache.hadoop.hbase.regionserver.handler">RpcControllerFactory</a>
-<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>PayloadCarryingRpcController</code></a></div>
+<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc"><code>HBaseRpcController</code></a></div>
 </td>
 </tr>
 </tbody>
@@ -571,7 +574,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcControllerFactory.html#org.apache.hadoop.hbase.regionserver.wal">RpcControllerFactory</a>
-<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>PayloadCarryingRpcController</code></a></div>
+<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc"><code>HBaseRpcController</code></a></div>
 </td>
 </tr>
 </tbody>
@@ -587,13 +590,13 @@ 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/ipc/class-use/PayloadCarryingRpcController.html#org.apache.hadoop.hbase.replication.regionserver">PayloadCarryingRpcController</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/HBaseRpcController.html#org.apache.hadoop.hbase.replication.regionserver">HBaseRpcController</a>
 <div class="block">Optionally carries Cells across the proxy/service interface 
down into ipc.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/class-use/RpcControllerFactory.html#org.apache.hadoop.hbase.replication.regionserver">RpcControllerFactory</a>
-<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc"><code>PayloadCarryingRpcController</code></a></div>
+<div class="block">Factory to create a <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc"><code>HBaseRpcController</code></a></div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/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 c4bdc72..b476d76 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/CellCreator.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/CellCreator.html
@@ -99,16 +99,16 @@ 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">PutSortReducer.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/mapreduce/PutSortReducer.html#kvCreator">kvCreator</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<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>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<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>&nbsp;</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>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/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 2fef41c..36952a1 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -270,8 +270,8 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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/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/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/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/RowCounter.RowCounterMapper.Counters.html"
 title="enum in org.apache.hadoop.hbase.mapreduce"><span 
class="strong">RowCounter.RowCounterMapper.Counters</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/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 4b632ee..29e138a 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-use.html
@@ -113,16 +113,6 @@ 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>
@@ -193,79 +183,84 @@ 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="altColor">
+<tr class="rowColor">
 <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>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <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>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <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="rowColor">
+<tr class="altColor">
 <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="altColor">
+<tr class="rowColor">
 <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="rowColor">
+<tr class="altColor">
 <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="altColor">
+<tr class="rowColor">
 <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="rowColor">
+<tr class="altColor">
 <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="altColor">
+<tr class="rowColor">
 <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="rowColor">
+<tr class="altColor">
 <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="altColor">
+<tr class="rowColor">
 <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="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/mapreduce/class-use/TableSplit.Version.html#org.apache.hadoop.hbase.mapreduce">TableSplit.Version</a>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <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="rowColor">
+<tr class="altColor">
 <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="altColor">
+<tr class="rowColor">
 <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/8ba76a42/devapidocs/org/apache/hadoop/hbase/master/RegionState.State.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/RegionState.State.html 
b/devapidocs/org/apache/hadoop/hbase/master/RegionState.State.html
index b977205..39dd081 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/RegionState.State.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/RegionState.State.html
@@ -392,7 +392,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" 
title="enum in org.apache.hadoop.hbase.master">RegionState.State</a>[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/master/RegionState.State.html#line.43">values</a>()</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" 
title="enum in org.apache.hadoop.hbase.master">RegionState.State</a>[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/master/RegionState.State.html#line.37">values</a>()</pre>
 <div class="block">Returns an array containing the constants of this enum 
type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
@@ -409,7 +409,7 @@ for (RegionState.State c : RegionState.State.values())
 <ul class="blockList">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" 
title="enum in org.apache.hadoop.hbase.master">RegionState.State</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/master/RegionState.State.html#line.43">valueOf</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;name)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" 
title="enum in org.apache.hadoop.hbase.master">RegionState.State</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/master/RegionState.State.html#line.37">valueOf</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;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified 
name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/devapidocs/org/apache/hadoop/hbase/master/ServerManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/ServerManager.html 
b/devapidocs/org/apache/hadoop/hbase/master/ServerManager.html
index 90f1e8b..c3e1f20 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/ServerManager.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/ServerManager.html
@@ -425,7 +425,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <td class="colLast"><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/ServerManager.html#moveFromOnelineToDeadServers(org.apache.hadoop.hbase.ServerName)">moveFromOnelineToDeadServers</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc">PayloadCarryingRpcController</a></code></td>
+<td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in 
org.apache.hadoop.hbase.ipc">HBaseRpcController</a></code></td>
 <td class="colLast"><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/ServerManager.html#newRpcController()">newRpcController</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -1175,7 +1175,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>newRpcController</h4>
-<pre>private&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/ipc/PayloadCarryingRpcController.html"
 title="class in 
org.apache.hadoop.hbase.ipc">PayloadCarryingRpcController</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/master/ServerManager.html#line.796">newRpcController</a>()</pre>
+<pre>private&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/ipc/HBaseRpcController.html" 
title="interface in org.apache.hadoop.hbase.ipc">HBaseRpcController</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/master/ServerManager.html#line.796">newRpcController</a>()</pre>
 </li>
 </ul>
 <a name="sendRegionClose(org.apache.hadoop.hbase.ServerName, 
org.apache.hadoop.hbase.HRegionInfo, org.apache.hadoop.hbase.ServerName)">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/devapidocs/org/apache/hadoop/hbase/master/balancer/class-use/BaseLoadBalancer.Cluster.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/balancer/class-use/BaseLoadBalancer.Cluster.html
 
b/devapidocs/org/apache/hadoop/hbase/master/balancer/class-use/BaseLoadBalancer.Cluster.html
index 571ad1d..a0a0b1b 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/master/balancer/class-use/BaseLoadBalancer.Cluster.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/balancer/class-use/BaseLoadBalancer.Cluster.html
@@ -123,16 +123,16 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
+<td class="colLast"><span 
class="strong">StochasticLoadBalancer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html#areSomeRegionReplicasColocated(org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster)">areSomeRegionReplicasColocated</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html"
 title="class in 
org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a>&nbsp;c)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><span 
class="strong">BaseLoadBalancer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#areSomeRegionReplicasColocated(org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster)">areSomeRegionReplicasColocated</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html"
 title="class in 
org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a>&nbsp;c)</code>
 <div class="block">Subclasses should implement this to return true if the 
cluster has nodes that hosts
  multiple replicas for the same region, or, if there are multiple racks and 
the same
  rack hosts replicas of the same region</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><span 
class="strong">StochasticLoadBalancer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html#areSomeRegionReplicasColocated(org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster)">areSomeRegionReplicasColocated</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html"
 title="class in 
org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a>&nbsp;c)</code>&nbsp;</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected double</code></td>
 <td class="colLast"><span 
class="strong">StochasticLoadBalancer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html#computeCost(org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster,%20double)">computeCost</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html"
 title="class in 
org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a>&nbsp;cluster,
@@ -196,11 +196,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><span 
class="strong">BaseLoadBalancer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#needsBalance(org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster)">needsBalance</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html"
 title="class in 
org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a>&nbsp;c)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">StochasticLoadBalancer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html#needsBalance(org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster)">needsBalance</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html"
 title="class in 
org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a>&nbsp;cluster)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><span 
class="strong">StochasticLoadBalancer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html#needsBalance(org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster)">needsBalance</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html"
 title="class in 
org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a>&nbsp;cluster)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BaseLoadBalancer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#needsBalance(org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster)">needsBalance</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html"
 title="class in 
org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a>&nbsp;c)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private int</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
index 3a094f9..9548d85 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
@@ -176,8 +176,8 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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.master.balancer.<a 
href="../../../../../../org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.Position.html"
 title="enum in org.apache.hadoop.hbase.master.balancer"><span 
class="strong">FavoredNodesPlan.Position</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.balancer.<a 
href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html"
 title="enum in org.apache.hadoop.hbase.master.balancer"><span 
class="strong">BaseLoadBalancer.Cluster.Action.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.balancer.<a 
href="../../../../../../org/apache/hadoop/hbase/master/balancer/FavoredNodesPlan.Position.html"
 title="enum in org.apache.hadoop.hbase.master.balancer"><span 
class="strong">FavoredNodesPlan.Position</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/devapidocs/org/apache/hadoop/hbase/master/class-use/AssignmentManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/class-use/AssignmentManager.html 
b/devapidocs/org/apache/hadoop/hbase/master/class-use/AssignmentManager.html
index 0a34d6d..714070f 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/class-use/AssignmentManager.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/class-use/AssignmentManager.html
@@ -108,27 +108,27 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span 
class="strong">UnAssignCallable.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/UnAssignCallable.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">AssignCallable.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignCallable.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>(package private) <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span 
class="strong">GeneralBulkAssigner.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/GeneralBulkAssigner.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
+<td class="colLast"><span 
class="strong">UnAssignCallable.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/UnAssignCallable.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span 
class="strong">GeneralBulkAssigner.SingleServerBulkAssigner.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/master/GeneralBulkAssigner.SingleServerBulkAssigner.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">BulkReOpen.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/BulkReOpen.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span class="strong">BulkReOpen.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/BulkReOpen.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span 
class="strong">AssignCallable.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignCallable.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>(package private) <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
+<td class="colLast"><span 
class="strong">GeneralBulkAssigner.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/GeneralBulkAssigner.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">GeneralBulkAssigner.SingleServerBulkAssigner.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/master/GeneralBulkAssigner.SingleServerBulkAssigner.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -141,11 +141,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#getAssignmentManager()">getAssignmentManager</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MasterServices.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getAssignmentManager()">getAssignmentManager</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span 
class="strong">MasterServices.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getAssignmentManager()">getAssignmentManager</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#getAssignmentManager()">getAssignmentManager</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -196,11 +196,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span 
class="strong">DisableTableProcedure.BulkDisabler.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.BulkDisabler.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">DispatchMergingRegionsProcedure.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/procedure/DispatchMergingRegionsProcedure.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span 
class="strong">DispatchMergingRegionsProcedure.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/procedure/DispatchMergingRegionsProcedure.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">DisableTableProcedure.BulkDisabler.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.BulkDisabler.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -254,17 +254,17 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
-<td class="colLast"><span 
class="strong">AssignmentManagerStatusTmplImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmplImpl.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
 <td class="colLast"><span 
class="strong">MasterStatusTmpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
 <td class="colLast"><span 
class="strong">MasterStatusTmplImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
+<td class="colLast"><span 
class="strong">AssignmentManagerStatusTmplImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmplImpl.html#assignmentManager">assignmentManager</a></strong></code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" 
title="class in 
org.apache.hadoop.hbase.master">AssignmentManager</a></code></td>
 <td class="colLast"><span 
class="strong">MasterStatusTmpl.ImplData.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#m_assignmentManager">m_assignmentManager</a></strong></code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/devapidocs/org/apache/hadoop/hbase/master/class-use/CatalogJanitor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/class-use/CatalogJanitor.html 
b/devapidocs/org/apache/hadoop/hbase/master/class-use/CatalogJanitor.html
index 201b368..4f7c0a6 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/class-use/CatalogJanitor.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/class-use/CatalogJanitor.html
@@ -109,11 +109,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html" 
title="class in org.apache.hadoop.hbase.master">CatalogJanitor</a></code></td>
-<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#getCatalogJanitor()">getCatalogJanitor</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MasterServices.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getCatalogJanitor()">getCatalogJanitor</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html" 
title="class in org.apache.hadoop.hbase.master">CatalogJanitor</a></code></td>
-<td class="colLast"><span 
class="strong">MasterServices.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getCatalogJanitor()">getCatalogJanitor</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#getCatalogJanitor()">getCatalogJanitor</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ba76a42/devapidocs/org/apache/hadoop/hbase/master/class-use/ClusterSchema.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/class-use/ClusterSchema.html 
b/devapidocs/org/apache/hadoop/hbase/master/class-use/ClusterSchema.html
index 1971236..c7710ce 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/class-use/ClusterSchema.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/class-use/ClusterSchema.html
@@ -124,11 +124,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/master/ClusterSchema.html" 
title="interface in 
org.apache.hadoop.hbase.master">ClusterSchema</a></code></td>
-<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#getClusterSchema()">getClusterSchema</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MasterServices.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getClusterSchema()">getClusterSchema</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/master/ClusterSchema.html" 
title="interface in 
org.apache.hadoop.hbase.master">ClusterSchema</a></code></td>
-<td class="colLast"><span 
class="strong">MasterServices.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getClusterSchema()">getClusterSchema</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#getClusterSchema()">getClusterSchema</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

Reply via email to