http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6fea47de/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 05d1e35..55c4941 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
@@ -324,17 +324,17 @@
 <td class="colLast"><span 
class="strong">ActiveMasterManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/ActiveMasterManager.html#master">master</a></strong></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="strong">BulkAssigner.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/BulkAssigner.html#server">server</a></strong></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="strong">CatalogJanitor.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html#server">server</a></strong></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="strong">SplitLogManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.html#server">server</a></strong></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="strong">BulkAssigner.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/BulkAssigner.html#server">server</a></strong></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
constructors, and an explanation">
@@ -431,19 +431,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="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HeapMemoryManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html#server">server</a></strong></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="strong">SplitTransactionImpl.DaughterOpener.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></strong></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="strong">LogRoller.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.DaughterOpener.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></strong></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="strong">HeapMemoryManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">LogRoller.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -456,21 +456,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="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getServer()">getServer</a></strong>()</code>
-<div class="block">Get the Server running the transaction or rollback</div>
-</td>
+<td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getServer()">getServer</a></strong>()</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="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getServer()">getServer</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getServer()">getServer</a></strong>()</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="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getServer()">getServer</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getServer()">getServer</a></strong>()</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="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getServer()">getServer</a></strong>()</code>
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getServer()">getServer</a></strong>()</code>
 <div class="block">Get the Server running the transaction or rollback</div>
 </td>
 </tr>
@@ -508,24 +508,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="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<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"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #execute(Server, RegionServerServices, 
User)</i></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="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<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="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<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="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<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>
@@ -534,27 +525,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="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<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="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<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"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use #execute(Server, RegionServerServices, 
User)</i></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="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<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="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<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="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<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,
@@ -562,6 +554,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="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<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="strong">ReplicationService.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ReplicationService.html#initialize(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.fs.Path)">initialize</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;rs,
@@ -597,24 +597,15 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<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"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #rollback(Server, RegionServerServices, 
User)</i></div>
-</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<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="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<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="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<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>
@@ -623,27 +614,28 @@
 </div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<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="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<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"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use #rollback(Server, RegionServerServices, 
User)</i></div>
+</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<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="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<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="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<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,
@@ -651,6 +643,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="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<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="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#stepsAfterPONR(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.regionserver.HRegion,%20org.apache.hadoop.hbase.security.User)">stepsAfterPONR</a></strong>(<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/6fea47de/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 83e62d0..41c3e74 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
@@ -248,11 +248,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="strong">Server.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/Server.html#getServerName()">getServerName</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">SplitLogTask.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/SplitLogTask.html#getServerName()">getServerName</a></strong>()</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="strong">SplitLogTask.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/SplitLogTask.html#getServerName()">getServerName</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Server.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/Server.html#getServerName()">getServerName</a></strong>()</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>
@@ -725,16 +725,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="strong">ConnectionImplementation.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#cacheLocation(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.HRegionLocation)">cacheLocation</a></strong>(<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="strong">MetaCache.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/MetaCache.html#cacheLocation(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.HRegionLocation)">cacheLocation</a></strong>(<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="strong">MetaCache.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/MetaCache.html#cacheLocation(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.HRegionLocation)">cacheLocation</a></strong>(<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="strong">ConnectionImplementation.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#cacheLocation(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.HRegionLocation)">cacheLocation</a></strong>(<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>
@@ -1033,18 +1033,18 @@
 <td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#rollWALWriterImpl(org.apache.hadoop.hbase.ServerName)">rollWALWriterImpl</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="altColor">
-<td class="colFirst"><code>(package private) void</code></td>
-<td class="colLast"><span 
class="strong">RegionServerCallable.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionServerCallable.html#setClientByServiceName(org.apache.hadoop.hbase.ServerName)">setClientByServiceName</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;service)</code>&nbsp;</td>
+<td class="colFirst"><code>(package private) abstract void</code></td>
+<td class="colLast"><span 
class="strong">AbstractRegionServerCallable.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/AbstractRegionServerCallable.html#setClientByServiceName(org.apache.hadoop.hbase.ServerName)">setClientByServiceName</a></strong>(<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="strong">NoncedRegionServerCallable.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/NoncedRegionServerCallable.html#setClientByServiceName(org.apache.hadoop.hbase.ServerName)">setClientByServiceName</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;service)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionServerCallable.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionServerCallable.html#setClientByServiceName(org.apache.hadoop.hbase.ServerName)">setClientByServiceName</a></strong>(<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>(package private) abstract void</code></td>
-<td class="colLast"><span 
class="strong">AbstractRegionServerCallable.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/AbstractRegionServerCallable.html#setClientByServiceName(org.apache.hadoop.hbase.ServerName)">setClientByServiceName</a></strong>(<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>
+<td class="colFirst"><code>(package private) void</code></td>
+<td class="colLast"><span 
class="strong">NoncedRegionServerCallable.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/NoncedRegionServerCallable.html#setClientByServiceName(org.apache.hadoop.hbase.ServerName)">setClientByServiceName</a></strong>(<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>private void</code></td>
@@ -1281,19 +1281,19 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span 
class="strong">ClientBackoffPolicyFactory.NoBackoffPolicy.</span><code><strong><a
 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.NoBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span 
class="strong">ExponentialClientBackoffPolicy.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<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="strong">ExponentialClientBackoffPolicy.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span 
class="strong">ClientBackoffPolicy.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<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="strong">ClientBackoffPolicy.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span 
class="strong">ClientBackoffPolicyFactory.NoBackoffPolicy.</span><code><strong><a
 
href="../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.NoBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<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>
@@ -1418,12 +1418,10 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">MasterObserver.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postMove(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.ServerName)">postMove</a></strong>(<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="strong">BaseMasterObserver.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#postMove(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.ServerName)">postMove</a></strong>(<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>
@@ -1434,19 +1432,19 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">BaseMasterObserver.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#postMove(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.ServerName)">postMove</a></strong>(<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="strong">MasterObserver.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postMove(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.ServerName)">postMove</a></strong>(<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="strong">MasterObserver.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMove(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.ServerName)">preMove</a></strong>(<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="strong">BaseMasterObserver.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#preMove(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.ServerName)">preMove</a></strong>(<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>
@@ -1457,10 +1455,12 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">BaseMasterObserver.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#preMove(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.ServerName)">preMove</a></strong>(<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="strong">MasterObserver.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMove(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.ServerName)">preMove</a></strong>(<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>
@@ -1540,30 +1540,30 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">RpcClientImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClientImpl.html#cancelConnections(org.apache.hadoop.hbase.ServerName)">cancelConnections</a></strong>(<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="strong">RpcClient.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#cancelConnections(org.apache.hadoop.hbase.ServerName)">cancelConnections</a></strong>(<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="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">RpcClient.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#cancelConnections(org.apache.hadoop.hbase.ServerName)">cancelConnections</a></strong>(<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="strong">RpcClientImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClientImpl.html#cancelConnections(org.apache.hadoop.hbase.ServerName)">cancelConnections</a></strong>(<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="rowColor">
 <td class="colFirst"><code>com.google.protobuf.BlockingRpcChannel</code></td>
-<td class="colLast"><span 
class="strong">AbstractRpcClient.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AbstractRpcClient.html#createBlockingRpcChannel(org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User,%20int)">createBlockingRpcChannel</a></strong>(<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;defaultOperationTimeout)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>com.google.protobuf.BlockingRpcChannel</code></td>
 <td class="colLast"><span class="strong">RpcClient.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#createBlockingRpcChannel(org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User,%20int)">createBlockingRpcChannel</a></strong>(<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="altColor">
+<td class="colFirst"><code>com.google.protobuf.BlockingRpcChannel</code></td>
+<td class="colLast"><span 
class="strong">AbstractRpcClient.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AbstractRpcClient.html#createBlockingRpcChannel(org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User,%20int)">createBlockingRpcChannel</a></strong>(<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;defaultOperationTimeout)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>com.google.protobuf.RpcChannel</code></td>
 <td class="colLast"><span 
class="strong">AsyncRpcClient.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/AsyncRpcClient.html#createProtobufRpcChannel(org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User,%20int)">createProtobufRpcChannel</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn,
@@ -1572,18 +1572,18 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>com.google.protobuf.RpcChannel</code></td>
-<td class="colLast"><span class="strong">RpcClientImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClientImpl.html#createProtobufRpcChannel(org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User,%20int)">createProtobufRpcChannel</a></strong>(<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="rowColor">
-<td class="colFirst"><code>com.google.protobuf.RpcChannel</code></td>
 <td class="colLast"><span class="strong">RpcClient.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClient.html#createProtobufRpcChannel(org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User,%20int)">createProtobufRpcChannel</a></strong>(<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 protobuf 
service.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>com.google.protobuf.RpcChannel</code></td>
+<td class="colLast"><span class="strong">RpcClientImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcClientImpl.html#createProtobufRpcChannel(org.apache.hadoop.hbase.ServerName,%20org.apache.hadoop.hbase.security.User,%20int)">createProtobufRpcChannel</a></strong>(<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 border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
constructors, and an explanation">
@@ -2458,16 +2458,16 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">RegionStates.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionStates.html#regionOnline(org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName)">regionOnline</a></strong>(<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="strong">LoadBalancer.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/LoadBalancer.html#regionOnline(org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName)">regionOnline</a></strong>(<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="strong">RegionStates.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionStates.html#regionOnline(org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName)">regionOnline</a></strong>(<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="strong">AssignmentManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html#regionOnline(org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.ServerName)">regionOnline</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;regionInfo,
@@ -3603,11 +3603,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="strong">ServerCrashProcedure.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.html#getServerName()">getServerName</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">ServerProcedureInterface.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.html#getServerName()">getServerName</a></strong>()</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="strong">ServerProcedureInterface.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.html#getServerName()">getServerName</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">ServerCrashProcedure.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.html#getServerName()">getServerName</a></strong>()</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>
@@ -3744,21 +3744,21 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>protected abstract void</code></td>
-<td class="colLast"><span 
class="strong">TakeSnapshotHandler.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.html#snapshotRegions(java.util.List)">snapshotRegions</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">EnabledTableSnapshotHandler.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/snapshot/EnabledTableSnapshotHandler.html#snapshotRegions(java.util.List)">snapshotRegions</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">DisabledTableSnapshotHandler.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/snapshot/DisabledTableSnapshotHandler.html#snapshotRegions(java.util.List)">snapshotRegions</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">TakeSnapshotHandler.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.html#snapshotRegions(java.util.List)">snapshotRegions</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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>
@@ -3870,16 +3870,16 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#removeFromOnlineRegions(org.apache.hadoop.hbase.regionserver.Region,%20org.apache.hadoop.hbase.ServerName)">removeFromOnlineRegions</a></strong>(<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="strong">OnlineRegions.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/OnlineRegions.html#removeFromOnlineRegions(org.apache.hadoop.hbase.regionserver.Region,%20org.apache.hadoop.hbase.ServerName)">removeFromOnlineRegions</a></strong>(<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="strong">HRegionServer.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#removeFromOnlineRegions(org.apache.hadoop.hbase.regionserver.Region,%20org.apache.hadoop.hbase.ServerName)">removeFromOnlineRegions</a></strong>(<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 border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
constructors, and an explanation">
@@ -4311,23 +4311,23 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">MasterStatusTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#m_servers">m_servers</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionServerListTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#m_servers">m_servers</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#m_servers">m_servers</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MasterStatusTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#m_servers">m_servers</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">MasterStatusTmpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#servers">servers</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionServerListTmpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html#servers">servers</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmplImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmplImpl.html#servers">servers</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">MasterStatusTmpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#servers">servers</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html#servers">servers</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmplImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmplImpl.html#servers">servers</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&gt;</code></td>
@@ -4361,11 +4361,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">MasterStatusTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#getServers()">getServers</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionServerListTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#getServers()">getServers</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#getServers()">getServers</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MasterStatusTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#getServers()">getServers</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -4438,20 +4438,20 @@
 <td class="colLast"><span 
class="strong">MasterStatusTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#setDeadServers(java.util.Set)">setDeadServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/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="strong">MasterStatusTmpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#setServers(java.util.List)">setServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html#setServers(java.util.List)">setServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">MasterStatusTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#setServers(java.util.List)">setServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#setServers(java.util.List)">setServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.html#setServers(java.util.List)">setServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">MasterStatusTmpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#setServers(java.util.List)">setServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">RegionServerListTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.ImplData.html#setServers(java.util.List)">setServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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="strong">MasterStatusTmpl.ImplData.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#setServers(java.util.List)">setServers</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&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/6fea47de/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 44ba6d4..7be3309 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/TableDescriptors.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/TableDescriptors.html
@@ -118,11 +118,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="strong">MasterServices.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getTableDescriptors()">getTableDescriptors</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HMaster.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.html#getTableDescriptors()">getTableDescriptors</a></strong>()</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="strong">HMaster.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.html#getTableDescriptors()">getTableDescriptors</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MasterServices.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getTableDescriptors()">getTableDescriptors</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

Reply via email to