http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f55baeba/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 e162915..6f82fe2 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
@@ -170,13 +170,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="typeNameLabel">ZkCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#server">server</a></span></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="typeNameLabel">ZKSplitLogManagerCoordination.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.html#server">server</a></span></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="typeNameLabel">ZkCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#server">server</a></span></code> </td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0"
summary="Use table, listing methods, and an explanation">
@@ -188,11 +188,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="typeNameLabel">ZkCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#getServer--">getServer</a></span>()</code> </td>
+<td class="colLast"><span
class="typeNameLabel">BaseCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#getServer--">getServer</a></span>()</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="typeNameLabel">BaseCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#getServer--">getServer</a></span>()</code> </td>
+<td class="colLast"><span
class="typeNameLabel">ZkCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#getServer--">getServer</a></span>()</code> </td>
</tr>
</tbody>
</table>
@@ -205,11 +205,11 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="typeNameLabel">ZkCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#initialize-org.apache.hadoop.hbase.Server-">initialize</a></span>(<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="typeNameLabel">BaseCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#initialize-org.apache.hadoop.hbase.Server-">initialize</a></span>(<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="typeNameLabel">BaseCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#initialize-org.apache.hadoop.hbase.Server-">initialize</a></span>(<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="typeNameLabel">ZkCoordinatedStateManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#initialize-org.apache.hadoop.hbase.Server-">initialize</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server)</code> </td>
</tr>
</tbody>
</table>
@@ -337,11 +337,11 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>private <a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">SplitLogManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.html#server">server</a></span></code> </td>
+<td class="colLast"><span
class="typeNameLabel">CatalogJanitor.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html#server">server</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private <a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">CatalogJanitor.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html#server">server</a></span></code> </td>
+<td class="colLast"><span
class="typeNameLabel">SplitLogManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.html#server">server</a></span></code> </td>
</tr>
</tbody>
</table>
@@ -439,19 +439,19 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private <a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">HeapMemoryManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html#server">server</a></span></code> </td>
+<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>private <a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span class="typeNameLabel">LogRoller.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></span></code> </td>
+<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.DaughterOpener.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></span></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private <a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></span></code> </td>
+<td class="colLast"><span class="typeNameLabel">LogRoller.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></span></code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>private <a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.DaughterOpener.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></span></code> </td>
+<td class="colLast"><span
class="typeNameLabel">HeapMemoryManager.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html#server">server</a></span></code> </td>
</tr>
</tbody>
</table>
@@ -464,23 +464,23 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getServer--">getServer</a></span>()</code> </td>
+<td class="colLast"><span
class="typeNameLabel">RegionMergeTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getServer--">getServer</a></span>()</code>
+<div class="block">Get the Server running the transaction or rollback</div>
+</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getServer--">getServer</a></span>()</code>
-<div class="block">Get the Server running the transaction or rollback</div>
-</td>
+<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getServer--">getServer</a></span>()</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">RegionMergeTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getServer--">getServer</a></span>()</code>
-<div class="block">Get the Server running the transaction or rollback</div>
-</td>
+<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getServer--">getServer</a></span>()</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="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getServer--">getServer</a></span>()</code> </td>
+<td class="colLast"><span
class="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getServer--">getServer</a></span>()</code>
+<div class="block">Get the Server running the transaction or rollback</div>
+</td>
</tr>
</tbody>
</table>
@@ -516,20 +516,6 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html"
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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/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="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
- <a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use #execute(Server,
RegionServerServices, User); as of 1.0.2, remove in 3.0</span></div>
-</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html"
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
<td class="colLast"><span
class="typeNameLabel">RegionMergeTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>
@@ -538,22 +524,22 @@
</td>
</tr>
<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><<a
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html"
title="interface in
org.apache.hadoop.hbase.regionserver">Region</a>></code></td>
-<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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">
-<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html"
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
-<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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>
+<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="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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/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="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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>
-<div class="block">Run the transaction.</div>
+<td class="colLast"><span
class="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
+ <a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">use #execute(Server,
RegionServerServices, User); as of 1.0.2, remove in 3.0</span></div>
+</div>
</td>
</tr>
<tr class="rowColor">
@@ -565,11 +551,25 @@
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html"
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
+<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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="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="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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/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="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">execute</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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>
+<div class="block">Run the transaction.</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span
class="typeNameLabel">ReplicationService.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/ReplicationService.html#initialize-org.apache.hadoop.hbase.Server-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.fs.Path-org.apache.hadoop.fs.Path-">initialize</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> rs,
@@ -605,20 +605,6 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<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="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
- <a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">use #rollback(Server,
RegionServerServices, User); as of 1.0.2, remove in 3.0</span></div>
-</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span
class="typeNameLabel">RegionMergeTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
<a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>
@@ -628,21 +614,21 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
+<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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>
+<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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>
-<div class="block">Roll back a failed transaction</div>
+<td class="colLast"><span
class="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,
+ <a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
title="interface in
org.apache.hadoop.hbase.regionserver">RegionServerServices</a> services)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">use #rollback(Server,
RegionServerServices, User); as of 1.0.2, remove in 3.0</span></div>
+</div>
</td>
</tr>
<tr class="rowColor">
@@ -655,10 +641,24 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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="rowColor">
+<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span
class="typeNameLabel">SplitTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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="typeNameLabel">SplitTransaction.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.security.User-">rollback</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> 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>
+<div class="block">Roll back a failed transaction</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span
class="typeNameLabel">RegionMergeTransactionImpl.</span><code><span
class="memberNameLink"><a
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#stepsAfterPONR-org.apache.hadoop.hbase.Server-org.apache.hadoop.hbase.regionserver.RegionServerServices-org.apache.hadoop.hbase.regionserver.HRegion-org.apache.hadoop.hbase.security.User-">stepsAfterPONR</a></span>(<a
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in
org.apache.hadoop.hbase">Server</a> server,