http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd52f877/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
index 6f82fe2..4b95eae 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
@@ -332,17 +332,17 @@
 <td class="colLast"><span 
class="typeNameLabel">ActiveMasterManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/ActiveMasterManager.html#master">master</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">BulkAssigner.</span><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/BulkAssigner.html#server">server</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">CatalogJanitor.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html#server">server</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitLogManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.html#server">server</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">BulkAssigner.</span><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/BulkAssigner.html#server">server</a></span></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing constructors, and an explanation">
@@ -439,19 +439,19 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">HeapMemoryManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html#server">server</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.DaughterOpener.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span class="typeNameLabel">LogRoller.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.DaughterOpener.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">HeapMemoryManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html#server">server</a></span></code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">LogRoller.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></span></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -464,21 +464,21 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getServer--">getServer</a></span>()</code>
-<div class="block">Get the Server running the transaction or rollback</div>
-</td>
+<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getServer--">getServer</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getServer--">getServer</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getServer--">getServer</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getServer--">getServer</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">SplitTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getServer--">getServer</a></span>()</code>
+<div class="block">Get the Server running the transaction or rollback</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">SplitTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getServer--">getServer</a></span>()</code>
+<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getServer--">getServer</a></span>()</code>
 <div class="block">Get the Server running the transaction or rollback</div>
 </td>
 </tr>
@@ -516,24 +516,15 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
-       <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use #execute(Server, 
RegionServerServices, User)</span></div>
-</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
@@ -542,27 +533,28 @@
 </div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
-       <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
-       <a href="../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
-<div class="block">Run the transaction.</div>
+<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+       <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use #execute(Server, 
RegionServerServices, User)</span></div>
+</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
        <a href="../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in 
org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
        <a href="../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in 
org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
@@ -570,6 +562,14 @@
 <div class="block">Run the transaction.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+       <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
+       <a href="../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
+<div class="block">Run the transaction.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">ReplicationService.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ReplicationService.html#initialize-org.apache.hadoop.hbase.Server-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.fs.Path-org.apache.hadoop.fs.Path-">initialize</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;rs,
@@ -605,24 +605,15 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
-        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">use #rollback(Server, 
RegionServerServices, User)</span></div>
-</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
         <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
         <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
         <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
@@ -631,27 +622,28 @@
 </div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
-        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
-        <a href="../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
-<div class="block">Roll back a failed transaction</div>
+<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use #rollback(Server, 
RegionServerServices, User)</span></div>
+</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
         <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
         <a href="../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in 
org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
         <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
         <a href="../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in 
org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="typeNameLabel">SplitTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
         <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
@@ -659,6 +651,14 @@
 <div class="block">Roll back a failed transaction</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span 
class="typeNameLabel">RegionMergeTransaction.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+        <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
+        <a href="../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
+<div class="block">Roll back a failed transaction</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#stepsAfterPONR-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.regionserver.HRegion-org.apache.hadoop.hbase.security.User-">stepsAfterPONR</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd52f877/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
index 10b1dad..389cfd5 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
@@ -256,11 +256,11 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Server.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/Server.html#getServerName--">getServerName</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">SplitLogTask.</span><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/SplitLogTask.html#getServerName--">getServerName</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">SplitLogTask.</span><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/SplitLogTask.html#getServerName--">getServerName</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">Server.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/Server.html#getServerName--">getServerName</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a></code></td>
@@ -733,16 +733,16 @@
                               <a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.AsyncRequestFutureImpl.SingleServerRequestRunnable.html"
 title="class in 
org.apache.hadoop.hbase.client">AsyncProcess.AsyncRequestFutureImpl.SingleServerRequestRunnable</a>&nbsp;runnable)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>private void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ConnectionImplementation.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#cacheLocation-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.HRegionLocation-">cacheLocation</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MetaCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/MetaCache.html#cacheLocation-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.HRegionLocation-">cacheLocation</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
              <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;source,
              <a 
href="../../../../../org/apache/hadoop/hbase/HRegionLocation.html" title="class 
in org.apache.hadoop.hbase">HRegionLocation</a>&nbsp;location)</code>
 <div class="block">Put a newly discovered HRegionLocation into the cache.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MetaCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/MetaCache.html#cacheLocation-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.HRegionLocation-">cacheLocation</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span 
class="typeNameLabel">ConnectionImplementation.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#cacheLocation-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.HRegionLocation-">cacheLocation</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
              <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;source,
              <a 
href="../../../../../org/apache/hadoop/hbase/HRegionLocation.html" title="class 
in org.apache.hadoop.hbase">HRegionLocation</a>&nbsp;location)</code>
 <div class="block">Put a newly discovered HRegionLocation into the cache.</div>
@@ -1041,15 +1041,15 @@
 <td class="colLast"><span class="typeNameLabel">HBaseAdmin.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#rollWALWriterImpl-org.apache.hadoop.hbase.ServerName-">rollWALWriterImpl</a></span>(<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="altColor">
-<td class="colFirst"><code>(package private) void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerCallable.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionServerCallable.html#setClientByServiceName-org.apache.hadoop.hbase.ServerName-">setClientByServiceName</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;service)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>(package private) abstract void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">AbstractRegionServerCallable.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/AbstractRegionServerCallable.html#setClientByServiceName-org.apache.hadoop.hbase.ServerName-">setClientByServiceName</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serviceName)</code>
 <div class="block">Set the Rpc client for Client services</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>(package private) void</code></td>
+<td class="colLast"><span 
class="typeNameLabel">RegionServerCallable.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionServerCallable.html#setClientByServiceName-org.apache.hadoop.hbase.ServerName-">setClientByServiceName</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;service)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">AsyncProcess.AsyncRequestFutureImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.AsyncRequestFutureImpl.html#setError-int-org.apache.hadoop.hbase.client.Row-java.lang.Throwable-org.apache.hadoop.hbase.ServerName-">setError</a></span>(int&nbsp;index,
@@ -1285,19 +1285,19 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ClientBackoffPolicyFactory.NoBackoffPolicy.</span><code><span
 class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.NoBackoffPolicy.html#getBackoffTime-org.apache.hadoop.hbase.ServerName-byte:A-org.apache.hadoop.hbase.client.backoff.ServerStatistics-">getBackoffTime</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span 
class="typeNameLabel">ExponentialClientBackoffPolicy.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html#getBackoffTime-org.apache.hadoop.hbase.ServerName-byte:A-org.apache.hadoop.hbase.client.backoff.ServerStatistics-">getBackoffTime</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
               byte[]&nbsp;region,
               <a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ServerStatistics.html"
 title="class in 
org.apache.hadoop.hbase.client.backoff">ServerStatistics</a>&nbsp;stats)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ExponentialClientBackoffPolicy.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html#getBackoffTime-org.apache.hadoop.hbase.ServerName-byte:A-org.apache.hadoop.hbase.client.backoff.ServerStatistics-">getBackoffTime</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span 
class="typeNameLabel">ClientBackoffPolicy.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicy.html#getBackoffTime-org.apache.hadoop.hbase.ServerName-byte:A-org.apache.hadoop.hbase.client.backoff.ServerStatistics-">getBackoffTime</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
               byte[]&nbsp;region,
               <a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ServerStatistics.html"
 title="class in 
org.apache.hadoop.hbase.client.backoff">ServerStatistics</a>&nbsp;stats)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ClientBackoffPolicy.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicy.html#getBackoffTime-org.apache.hadoop.hbase.ServerName-byte:A-org.apache.hadoop.hbase.client.backoff.ServerStatistics-">getBackoffTime</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span 
class="typeNameLabel">ClientBackoffPolicyFactory.NoBackoffPolicy.</span><code><span
 class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.NoBackoffPolicy.html#getBackoffTime-org.apache.hadoop.hbase.ServerName-byte:A-org.apache.hadoop.hbase.client.backoff.ServerStatistics-">getBackoffTime</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
               byte[]&nbsp;region,
               <a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ServerStatistics.html"
 title="class in 
org.apache.hadoop.hbase.client.backoff">ServerStatistics</a>&nbsp;stats)</code>&nbsp;</td>
 </tr>
@@ -1422,12 +1422,10 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">postMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" 
title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html"
 title="interface in 
org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
+<td class="colLast"><span 
class="typeNameLabel">BaseMasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#postMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">postMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" 
title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html"
 title="interface in 
org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
         <a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" 
title="class in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
         <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
-        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>
-<div class="block">Called after the region move has been requested.</div>
-</td>
+        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -1438,19 +1436,19 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">BaseMasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#postMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">postMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" 
title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html"
 title="interface in 
org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
+<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">postMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" 
title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html"
 title="interface in 
org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
         <a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" 
title="class in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
         <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
-        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>&nbsp;</td>
+        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>
+<div class="block">Called after the region move has been requested.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" 
title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html"
 title="interface in 
org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
+<td class="colLast"><span 
class="typeNameLabel">BaseMasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#preMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" 
title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html"
 title="interface in 
org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
        <a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" 
title="class in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
-       <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>
-<div class="block">Called prior to moving a given region from one region 
server to another.</div>
-</td>
+       <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
@@ -1461,10 +1459,12 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">BaseMasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#preMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" 
title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html"
 title="interface in 
org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
+<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" 
title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html"
 title="interface in 
org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
        <a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" 
title="class in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
-       <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>&nbsp;</td>
+       <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>
+<div class="block">Called prior to moving a given region from one region 
server to another.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -1538,14 +1538,14 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">AbstractRpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AbstractRpcClient.html#cancelConnections-org.apache.hadoop.hbase.ServerName-">cancelConnections</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn)</code>
-<div class="block">Interrupt the connections to the given ip:port server.</div>
+<td class="colLast"><span class="typeNameLabel">RpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#cancelConnections-org.apache.hadoop.hbase.ServerName-">cancelConnections</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn)</code>
+<div class="block">Interrupt the connections to the given server.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">RpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#cancelConnections-org.apache.hadoop.hbase.ServerName-">cancelConnections</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn)</code>
-<div class="block">Interrupt the connections to the given server.</div>
+<td class="colLast"><span 
class="typeNameLabel">AbstractRpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AbstractRpcClient.html#cancelConnections-org.apache.hadoop.hbase.ServerName-">cancelConnections</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn)</code>
+<div class="block">Interrupt the connections to the given ip:port server.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -1554,25 +1554,19 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>com.google.protobuf.BlockingRpcChannel</code></td>
-<td class="colLast"><span 
class="typeNameLabel">AbstractRpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AbstractRpcClient.html#createBlockingRpcChannel-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.security.User-int-">createBlockingRpcChannel</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn,
-                        <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;ticket,
-                        int&nbsp;rpcTimeout)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>com.google.protobuf.BlockingRpcChannel</code></td>
 <td class="colLast"><span class="typeNameLabel">RpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#createBlockingRpcChannel-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.security.User-int-">createBlockingRpcChannel</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn,
                         <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user,
                         int&nbsp;rpcTimeout)</code>
 <div class="block">Creates a "channel" that can be used by a blocking protobuf 
service.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>com.google.protobuf.RpcChannel</code></td>
-<td class="colLast"><span 
class="typeNameLabel">AbstractRpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AbstractRpcClient.html#createRpcChannel-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.security.User-int-">createRpcChannel</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn,
-                <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user,
-                int&nbsp;rpcTimeout)</code>&nbsp;</td>
-</tr>
 <tr class="altColor">
+<td class="colFirst"><code>com.google.protobuf.BlockingRpcChannel</code></td>
+<td class="colLast"><span 
class="typeNameLabel">AbstractRpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AbstractRpcClient.html#createBlockingRpcChannel-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.security.User-int-">createBlockingRpcChannel</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn,
+                        <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;ticket,
+                        int&nbsp;rpcTimeout)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>com.google.protobuf.RpcChannel</code></td>
 <td class="colLast"><span class="typeNameLabel">RpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#createRpcChannel-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.security.User-int-">createRpcChannel</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn,
                 <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user,
@@ -1580,6 +1574,12 @@
 <div class="block">Creates a "channel" that can be used by a protobuf 
service.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>com.google.protobuf.RpcChannel</code></td>
+<td class="colLast"><span 
class="typeNameLabel">AbstractRpcClient.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AbstractRpcClient.html#createRpcChannel-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.security.User-int-">createRpcChannel</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn,
+                <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user,
+                int&nbsp;rpcTimeout)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing constructors, and an explanation">
@@ -2442,16 +2442,16 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionStates.html#regionOnline-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-">regionOnline</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;hri,
-            <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">LoadBalancer.</span><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/LoadBalancer.html#regionOnline-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-">regionOnline</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;regionInfo,
             <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;sn)</code>
 <div class="block">Marks the region as online at balancer.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="typeNameLabel">RegionStates.</span><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionStates.html#regionOnline-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-">regionOnline</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;hri,
+            <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">AssignmentManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html#regionOnline-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-">regionOnline</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;regionInfo,
@@ -3587,11 +3587,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ServerCrashProcedure.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.html#getServerName--">getServerName</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ServerProcedureInterface.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.html#getServerName--">getServerName</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ServerProcedureInterface.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.html#getServerName--">getServerName</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ServerCrashProcedure.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.html#getServerName--">getServerName</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a></code></td>
@@ -3728,21 +3728,21 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>protected abstract void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">TakeSnapshotHandler.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.html#snapshotRegions-java.util.List-">snapshotRegions</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in 
org.apache.hadoop.hbase.util">Pair</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>,<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&gt;&nbsp;regions)</code>
-<div class="block">Snapshot the specified regions</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">EnabledTableSnapshotHandler.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/snapshot/EnabledTableSnapshotHandler.html#snapshotRegions-java.util.List-">snapshotRegions</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in 
org.apache.hadoop.hbase.util">Pair</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>,<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&gt;&nbsp;regions)</code>
 <div class="block">This method kicks off a snapshot procedure.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">DisabledTableSnapshotHandler.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/snapshot/DisabledTableSnapshotHandler.html#snapshotRegions-java.util.List-">snapshotRegions</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in 
org.apache.hadoop.hbase.util">Pair</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>,<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&gt;&nbsp;regionsAndLocations)</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><span 
class="typeNameLabel">TakeSnapshotHandler.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.html#snapshotRegions-java.util.List-">snapshotRegions</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in 
org.apache.hadoop.hbase.util">Pair</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>,<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&gt;&nbsp;regions)</code>
+<div class="block">Snapshot the specified regions</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -3854,16 +3854,16 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="typeNameLabel">HRegionServer.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#removeFromOnlineRegions-org.apache.hadoop.hbase.regionserver.Region-org.apache.hadoop.hbase.ServerName-">removeFromOnlineRegions</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;r,
-                       <a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destination)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="typeNameLabel">OnlineRegions.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/OnlineRegions.html#removeFromOnlineRegions-org.apache.hadoop.hbase.regionserver.Region-org.apache.hadoop.hbase.ServerName-">removeFromOnlineRegions</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;r,
                        <a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destination)</code>
 <div class="block">This method removes Region corresponding to hri from the 
Map of onlineRegions.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span 
class="typeNameLabel">HRegionServer.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#removeFromOnlineRegions-org.apache.hadoop.hbase.regionserver.Region-org.apache.hadoop.hbase.ServerName-">removeFromOnlineRegions</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;r,
+                       <a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destination)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing constructors, and an explanation">
@@ -4295,23 +4295,23 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#m_servers">m_servers</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#m_servers">m_servers</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#m_servers">m_servers</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#m_servers">m_servers</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#servers">servers</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html#servers">servers</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmplImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmplImpl.html#servers">servers</a></span></code>&nbsp;</td>
+<td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
+<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#servers">servers</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html#servers">servers</a></span></code>&nbsp;</td>
+<td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
+<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmplImpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmplImpl.html#servers">servers</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
@@ -4345,11 +4345,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#getServers--">getServers</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#getServers--">getServers</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#getServers--">getServers</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#getServers--">getServers</a></span>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -4422,20 +4422,20 @@
 <td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#setDeadServers-java.util.Set-">setDeadServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true";
 title="class or interface in java.util">Set</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;deadServers)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" 
title="class in 
org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#setServers-java.util.List-">setServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;p_servers)</code>&nbsp;</td>
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html"
 title="class in 
org.apache.hadoop.hbase.tmpl.master">RegionServerListTmpl</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html#setServers-java.util.List-">setServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;p_servers)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#setServers-java.util.List-">setServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;servers)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#setServers-java.util.List-">setServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;servers)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html"
 title="class in 
org.apache.hadoop.hbase.tmpl.master">RegionServerListTmpl</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html#setServers-java.util.List-">setServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;p_servers)</code>&nbsp;</td>
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" 
title="class in 
org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#setServers-java.util.List-">setServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;p_servers)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerListTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#setServers-java.util.List-">setServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;servers)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">MasterStatusTmpl.ImplData.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#setServers-java.util.List-">setServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;servers)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd52f877/devapidocs/org/apache/hadoop/hbase/class-use/TableDescriptors.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/TableDescriptors.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/TableDescriptors.html
index 918699d..c3b2bc8 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/TableDescriptors.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/TableDescriptors.html
@@ -126,11 +126,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/TableDescriptors.html" 
title="interface in org.apache.hadoop.hbase">TableDescriptors</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterServices.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getTableDescriptors--">getTableDescriptors</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">HMaster.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.html#getTableDescriptors--">getTableDescriptors</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/TableDescriptors.html" 
title="interface in org.apache.hadoop.hbase">TableDescriptors</a></code></td>
-<td class="colLast"><span class="typeNameLabel">HMaster.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.html#getTableDescriptors--">getTableDescriptors</a></span>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">MasterServices.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getTableDescriptors--">getTableDescriptors</a></span>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

Reply via email to