http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16d2a5b1/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 3f9d94d..d9dd294 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>
@@ -333,15 +333,15 @@
</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">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">RegionStateStore.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/master/RegionStateStore.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>
</tbody>
</table>
@@ -473,19 +473,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">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">SplitTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.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.DaughterOpener.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.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.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.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>
<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> </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>
</tbody>
</table>
@@ -498,23 +498,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="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">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>
<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>
-<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> </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">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">SplitTransactionImpl.</span><code><strong><a
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.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">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">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>
</tbody>
</table>
@@ -550,20 +550,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="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/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">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> 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"><strong>Deprecated.</strong>
-<div class="block"><i>use #execute(Server, RegionServerServices, User); as of
1.0.2, remove in 3.0</i></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="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> 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"><strong>Deprecated.</strong>
@@ -572,22 +558,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="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="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> 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="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="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="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> 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="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> 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"><strong>Deprecated.</strong>
+<div class="block"><i>use #execute(Server, RegionServerServices, User); as of
1.0.2, remove in 3.0</i></div>
+</div>
</td>
</tr>
<tr class="rowColor">
@@ -599,11 +585,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="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="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,
<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="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> 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="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> rs,
@@ -639,20 +639,6 @@
</tr>
<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)">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">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> 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"><strong>Deprecated.</strong>
-<div class="block"><i>use #rollback(Server, RegionServerServices, User); as of
1.0.2, remove in 3.0</i></div>
-</div>
-</td>
-</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> 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"><strong>Deprecated.</strong>
@@ -662,21 +648,21 @@
</tr>
<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> 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="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> 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="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="altColor">
<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> 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="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> 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"><strong>Deprecated.</strong>
+<div class="block"><i>use #rollback(Server, RegionServerServices, User); as of
1.0.2, remove in 3.0</i></div>
+</div>
</td>
</tr>
<tr class="rowColor">
@@ -689,10 +675,24 @@
</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,
+ <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="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>
+<tr class="altColor">
+<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> 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="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> server,