http://git-wip-us.apache.org/repos/asf/hbase-site/blob/09017087/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 0f50d32..d2bc3fa 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
@@ -166,13 +166,13 @@
</tr>
<tbody>
<tr class="altColor">
-<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">ZkCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#server">server</a></strong></code> </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">ZKSplitLogManagerCoordination.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.html#server">server</a></strong></code> </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">ZkCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#server">server</a></strong></code> </td>
+</tr>
</tbody>
</table>
<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing
methods, and an explanation">
@@ -184,11 +184,11 @@
<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">ZkCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#getServer()">getServer</a></strong>()</code> </td>
+<td class="colLast"><span
class="strong">BaseCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#getServer()">getServer</a></strong>()</code> </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">BaseCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#getServer()">getServer</a></strong>()</code> </td>
+<td class="colLast"><span
class="strong">ZkCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#getServer()">getServer</a></strong>()</code> </td>
</tr>
</tbody>
</table>
@@ -201,11 +201,11 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="strong">ZkCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#initialize(org.apache.hadoop.hbase.Server)">initialize</a></strong>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server)</code> </td>
+<td class="colLast"><span
class="strong">BaseCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#initialize(org.apache.hadoop.hbase.Server)">initialize</a></strong>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="strong">BaseCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#initialize(org.apache.hadoop.hbase.Server)">initialize</a></strong>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server)</code> </td>
+<td class="colLast"><span
class="strong">ZkCoordinatedStateManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#initialize(org.apache.hadoop.hbase.Server)">initialize</a></strong>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server)</code> </td>
</tr>
</tbody>
</table>
@@ -324,32 +324,32 @@
</tr>
<tbody>
<tr class="altColor">
-<td class="colFirst"><code>(package 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">MasterFileSystem.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/MasterFileSystem.html#master">master</a></strong></code> </td>
+<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">ServerManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/ServerManager.html#master">master</a></strong></code> </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">ActiveMasterManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/ActiveMasterManager.html#master">master</a></strong></code> </td>
+<td class="colFirst"><code>(package 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">MasterFileSystem.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/MasterFileSystem.html#master">master</a></strong></code> </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">ServerManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/ServerManager.html#master">master</a></strong></code> </td>
+<td class="colLast"><span
class="strong">ActiveMasterManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/ActiveMasterManager.html#master">master</a></strong></code> </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> </td>
+<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">RegionStateStore.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/RegionStateStore.html#server">server</a></strong></code> </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">SplitLogManager.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.html#server">server</a></strong></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> </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">CatalogJanitor.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html#server">server</a></strong></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> </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">RegionStateStore.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/RegionStateStore.html#server">server</a></strong></code> </td>
+<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> </td>
</tr>
</tbody>
</table>
@@ -514,23 +514,23 @@
<tbody>
<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.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></strong></code> </td>
+<td class="colLast"><span
class="strong">RegionMergeTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#server">server</a></strong></code> </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">SplitTransactionImpl.DaughterOpener.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></strong></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> </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">LogRoller.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></strong></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> </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">RegionMergeTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#server">server</a></strong></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> </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> </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> </td>
</tr>
</tbody>
</table>
@@ -543,11 +543,11 @@
<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">SplitTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getServer()">getServer</a></strong>()</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> </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> </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> </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>
@@ -594,13 +594,13 @@
</td>
</tr>
<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><<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">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> server,
+<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> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code> </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> server,
+<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html"
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a><<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">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> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code> </td>
</tr>
<tr class="rowColor">
@@ -622,14 +622,14 @@
</td>
</tr>
<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><<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">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> server,
+<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> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services,
<a
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class
in org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
<tr class="altColor">
-<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/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> server,
+<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html"
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a><<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">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> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services,
<a
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class
in org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
@@ -684,12 +684,12 @@
</tr>
<tr class="rowColor">
<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> server,
+<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> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code> </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> server,
+<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> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code> </td>
</tr>
<tr class="rowColor">
@@ -712,13 +712,13 @@
</tr>
<tr class="rowColor">
<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> server,
+<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> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services,
<a
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class
in org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>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> server,
+<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> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services,
<a
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class
in org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
@@ -753,14 +753,14 @@
<a
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class
in org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html"
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a><<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">SplitTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#stepsBeforePONR(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20boolean)">stepsBeforePONR</a></strong>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
+<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html"
title="class in org.apache.hadoop.hbase.regionserver">HRegion</a></code></td>
+<td class="colLast"><span
class="strong">RegionMergeTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#stepsBeforePONR(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20boolean)">stepsBeforePONR</a></strong>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services,
boolean testing)</code> </td>
</tr>
<tr class="altColor">
-<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html"
title="class in org.apache.hadoop.hbase.regionserver">HRegion</a></code></td>
-<td class="colLast"><span
class="strong">RegionMergeTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#stepsBeforePONR(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20boolean)">stepsBeforePONR</a></strong>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
+<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html"
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a><<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">SplitTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#stepsBeforePONR(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20boolean)">stepsBeforePONR</a></strong>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services,
boolean testing)</code> </td>
</tr>