http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa343563/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 efd2448..f5188d3 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Interface org.apache.hadoop.hbase.Server (Apache HBase 
2.0.0-SNAPSHOT API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" 
title="Style">
 </head>
@@ -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>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
 <td class="colLast"><span 
class="strong">ZKSplitLogManagerCoordination.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
+<td class="colLast"><span 
class="strong">ZkCoordinatedStateManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#server">server</a></strong></code>&nbsp;</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">BaseCoordinatedStateManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coordination/BaseCoordinatedStateManager.html#getServer()">getServer</a></strong>()</code>&nbsp;</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>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="strong">ZkCoordinatedStateManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html#getServer()">getServer</a></strong>()</code>&nbsp;</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>&nbsp;</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">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>&nbsp;server)</code>&nbsp;</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>&nbsp;server)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <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>&nbsp;server)</code>&nbsp;</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>&nbsp;server)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -325,7 +325,7 @@
 <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">ActiveMasterManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/ActiveMasterManager.html#master">master</a></strong></code>&nbsp;</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>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <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>
@@ -333,24 +333,24 @@
 </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>&nbsp;</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>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span class="strong">BulkAssigner.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/BulkAssigner.html#server">server</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
 <td class="colLast"><span 
class="strong">CatalogJanitor.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
 <td class="colLast"><span 
class="strong">RegionStateStore.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionStateStore.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<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">SplitLogManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
+<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">BulkAssigner.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/master/BulkAssigner.html#server">server</a></strong></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">
@@ -522,23 +522,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">HeapMemoryManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span class="strong">LogRoller.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.DaughterOpener.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HeapMemoryManager.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.DaughterOpener.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.DaughterOpener.html#server">server</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">LogRoller.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/LogRoller.html#server">server</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -551,23 +551,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">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>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getServer()">getServer</a></strong>()</code>&nbsp;</td>
-</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">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getServer()">getServer</a></strong>()</code>
 <div class="block">Get the Server running the transaction or rollback</div>
 </td>
 </tr>
+<tr class="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>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a></code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getServer()">getServer</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">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>
 </tbody>
 </table>
@@ -602,61 +602,61 @@
 </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>&nbsp;server,
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+              <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #execute(Server, RegionServerServices, 
User)</i></div>
+<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="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
 <td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #execute(Server, RegionServerServices, User);  as of 
1.0.2, remove in 3.0</i></div>
+<div class="block"><i>use #execute(Server, RegionServerServices, 
User)</i></div>
 </div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
-              <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+              <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
+              <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="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,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
               <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Run the transaction.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
 <td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
               <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
               <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Run the transaction.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
-              <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
-              <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="strong">ReplicationService.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ReplicationService.html#initialize(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.fs.FileSystem,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.fs.Path)">initialize</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;rs,
@@ -692,60 +692,60 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+                <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #rollback(Server, RegionServerServices, 
User)</i></div>
+<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="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #rollback(Server, RegionServerServices, User); as of 
1.0.2, remove in 3.0</i></div>
+<div class="block"><i>use #rollback(Server, RegionServerServices, 
User)</i></div>
 </div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
-                <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+                <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
+                <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                 <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Roll back a failed transaction</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                 <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                 <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Roll back a failed transaction</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
-                <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
-                <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#stepsAfterPONR(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.regionserver.HRegion,%20org.apache.hadoop.hbase.security.User)">stepsAfterPONR</a></strong>(<a
 href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;server,
@@ -761,14 +761,14 @@
                             <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<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>&nbsp;server,
+<td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#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>&nbsp;server,
                               <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                               boolean&nbsp;testing)</code>&nbsp;</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>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#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>&nbsp;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>&nbsp;server,
                               <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                               boolean&nbsp;testing)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa343563/devapidocs/org/apache/hadoop/hbase/class-use/ServerLoad.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/ServerLoad.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/ServerLoad.html
index 2ba6b56..dfcced5 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/ServerLoad.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/ServerLoad.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.apache.hadoop.hbase.ServerLoad (Apache HBase 
2.0.0-SNAPSHOT API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" 
title="Style">
 </head>

Reply via email to