hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dimaspi...@apache.org
Subject [03/52] [partial] hbase-site git commit: Published site at e30a66b9443618f04ad8cb0aee96ac77b174338b.
Date Thu, 01 Sep 2016 15:14:13 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.RegionMergeTransactionPhase.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.RegionMergeTransactionPhase.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.RegionMergeTransactionPhase.html
index 4c7f16c..88da774 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.RegionMergeTransactionPhase.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.RegionMergeTransactionPhase.html
@@ -113,11 +113,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.RegionMergeTransactionPhase</a></code></td>
-<td class="colLast"><span class="strong">RegionMergeTransaction.JournalEntry.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.JournalEntry.html#getPhase()">getPhase</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">RegionMergeTransactionImpl.JournalEntryImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.JournalEntryImpl.html#getPhase()">getPhase</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.RegionMergeTransactionPhase</a></code></td>
-<td class="colLast"><span class="strong">RegionMergeTransactionImpl.JournalEntryImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.JournalEntryImpl.html#getPhase()">getPhase</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">RegionMergeTransaction.JournalEntry.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.JournalEntry.html#getPhase()">getPhase</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.RegionMergeTransactionPhase</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.TransactionListener.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.TransactionListener.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.TransactionListener.html
index cca221a..52044a9 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.TransactionListener.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.TransactionListener.html
@@ -111,15 +111,15 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction</a></code></td>
+<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#registerTransactionListener(org.apache.hadoop.hbase.regionserver.RegionMergeTransaction.TransactionListener)">registerTransactionListener</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.TransactionListener.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.TransactionListener</a>&nbsp;listener)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction</a></code></td>
 <td class="colLast"><span class="strong">RegionMergeTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#registerTransactionListener(org.apache.hadoop.hbase.regionserver.RegionMergeTransaction.TransactionListener)">registerTransactionListener</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.TransactionListener.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.TransactionListener</a>&nbsp;listener)</code>
 <div class="block">Register a listener for transaction preparation, execution, and possibly
  rollback phases.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction</a></code></td>
-<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#registerTransactionListener(org.apache.hadoop.hbase.regionserver.RegionMergeTransaction.TransactionListener)">registerTransactionListener</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.TransactionListener.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.TransactionListener</a>&nbsp;listener)</code>&nbsp;</td>
-</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.html
index 7219aa0..c69343a 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionMergeTransaction.html
@@ -109,15 +109,15 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction</a></code></td>
+<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#registerTransactionListener(org.apache.hadoop.hbase.regionserver.RegionMergeTransaction.TransactionListener)">registerTransactionListener</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.TransactionListener.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.TransactionListener</a>&nbsp;listener)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction</a></code></td>
 <td class="colLast"><span class="strong">RegionMergeTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#registerTransactionListener(org.apache.hadoop.hbase.regionserver.RegionMergeTransaction.TransactionListener)">registerTransactionListener</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.TransactionListener.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.TransactionListener</a>&nbsp;listener)</code>
 <div class="block">Register a listener for transaction preparation, execution, and possibly
  rollback phases.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction</a></code></td>
-<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#registerTransactionListener(org.apache.hadoop.hbase.regionserver.RegionMergeTransaction.TransactionListener)">registerTransactionListener</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.TransactionListener.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionMergeTransaction.TransactionListener</a>&nbsp;listener)</code>&nbsp;</td>
-</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionScanner.html
index 397dda4..da5381a 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionScanner.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionScanner.html
@@ -277,21 +277,16 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionScanner</a></code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getScanner(org.apache.hadoop.hbase.client.Scan)">getScanner</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionScanner</a></code></td>
 <td class="colLast"><span class="strong">Region.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html#getScanner(org.apache.hadoop.hbase.client.Scan)">getScanner</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan)</code>
 <div class="block">Return an iterator that scans over the HRegion, returning the indicated
  columns and rows specified by the <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionScanner</a></code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getScanner(org.apache.hadoop.hbase.client.Scan,%20java.util.List)">getScanner</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
-                    <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;&nbsp;additionalScanners)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getScanner(org.apache.hadoop.hbase.client.Scan)">getScanner</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionScanner</a></code></td>
 <td class="colLast"><span class="strong">Region.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html#getScanner(org.apache.hadoop.hbase.client.Scan,%20java.util.List)">getScanner</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;&nbsp;additionalScanners)</code>
@@ -299,6 +294,11 @@
  specified by the <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a>.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionScanner</a></code></td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getScanner(org.apache.hadoop.hbase.client.Scan,%20java.util.List)">getScanner</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
+                    <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;&nbsp;additionalScanners)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionScanner</a></code></td>
 <td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getScanner(org.apache.hadoop.hbase.client.Scan,%20java.util.List,%20long,%20long)">getScanner</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerAccounting.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerAccounting.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerAccounting.html
index 627e423..8dddbd4 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerAccounting.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerAccounting.html
@@ -117,11 +117,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerAccounting.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerAccounting</a></code></td>
-<td class="colLast"><span class="strong">RegionServerServices.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html#getRegionServerAccounting()">getRegionServerAccounting</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getRegionServerAccounting()">getRegionServerAccounting</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerAccounting.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerAccounting</a></code></td>
-<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getRegionServerAccounting()">getRegionServerAccounting</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">RegionServerServices.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html#getRegionServerAccounting()">getRegionServerAccounting</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.PostOpenDeployContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.PostOpenDeployContext.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.PostOpenDeployContext.html
index 3805046..6c3312b 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.PostOpenDeployContext.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.PostOpenDeployContext.html
@@ -96,15 +96,15 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#postOpenDeployTasks(org.apache.hadoop.hbase.regionserver.RegionServerServices.PostOpenDeployContext)">postOpenDeployTasks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.PostOpenDeployContext.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerServices.PostOpenDeployContext</a>&nbsp;context)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">RegionServerServices.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html#postOpenDeployTasks(org.apache.hadoop.hbase.regionserver.RegionServerServices.PostOpenDeployContext)">postOpenDeployTasks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.PostOpenDeployContext.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerServices.PostOpenDeployContext</a>&nbsp;context)</code>
 <div class="block">Tasks to perform after region open to complete deploy of region on
  regionserver</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#postOpenDeployTasks(org.apache.hadoop.hbase.regionserver.RegionServerServices.PostOpenDeployContext)">postOpenDeployTasks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.PostOpenDeployContext.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerServices.PostOpenDeployContext</a>&nbsp;context)</code>&nbsp;</td>
-</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.RegionStateTransitionContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.RegionStateTransitionContext.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.RegionStateTransitionContext.html
index 3f242aa..af33cd3 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.RegionStateTransitionContext.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.RegionStateTransitionContext.html
@@ -96,13 +96,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">RegionServerServices.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html#reportRegionStateTransition(org.apache.hadoop.hbase.regionserver.RegionServerServices.RegionStateTransitionContext)">reportRegionStateTransition</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.RegionStateTransitionContext.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerServices.RegionStateTransitionContext</a>&nbsp;context)</code>
-<div class="block">Notify master that a handler requests to change a region state</div>
-</td>
+<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#reportRegionStateTransition(org.apache.hadoop.hbase.regionserver.RegionServerServices.RegionStateTransitionContext)">reportRegionStateTransition</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.RegionStateTransitionContext.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerServices.RegionStateTransitionContext</a>&nbsp;context)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#reportRegionStateTransition(org.apache.hadoop.hbase.regionserver.RegionServerServices.RegionStateTransitionContext)">reportRegionStateTransition</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.RegionStateTransitionContext.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerServices.RegionStateTransitionContext</a>&nbsp;context)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">RegionServerServices.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html#reportRegionStateTransition(org.apache.hadoop.hbase.regionserver.RegionServerServices.RegionStateTransitionContext)">reportRegionStateTransition</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.RegionStateTransitionContext.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServerServices.RegionStateTransitionContext</a>&nbsp;context)</code>
+<div class="block">Notify master that a handler requests to change a region state</div>
+</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
index e87acf1..61adf37 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
@@ -226,15 +226,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">RegionServerProcedureManagerHost.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/procedure/RegionServerProcedureManagerHost.html#initialize(org.apache.hadoop.hbase.regionserver.RegionServerServices)">initialize</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;rss)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>abstract void</code></td>
 <td class="colLast"><span class="strong">RegionServerProcedureManager.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/procedure/RegionServerProcedureManager.html#initialize(org.apache.hadoop.hbase.regionserver.RegionServerServices)">initialize</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;rss)</code>
 <div class="block">Initialize a globally barriered procedure for region servers.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">RegionServerProcedureManagerHost.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/procedure/RegionServerProcedureManagerHost.html#initialize(org.apache.hadoop.hbase.regionserver.RegionServerServices)">initialize</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;rss)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -285,11 +285,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">RegionServerQuotaManager.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/quotas/RegionServerQuotaManager.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">QuotaCache.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/quotas/QuotaCache.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">QuotaCache.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/quotas/QuotaCache.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">RegionServerQuotaManager.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/quotas/RegionServerQuotaManager.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -343,26 +343,26 @@
 <td class="colLast"><span class="strong">CompactedHFilesDischarger.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.html#regionServerServices">regionServerServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span class="strong">RegionServerCoprocessorHost.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
 <td class="colLast"><span class="strong">RegionCoprocessorHost.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html#rsServices">rsServices</a></strong></code>
 <div class="block">The region server services</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">RegionCoprocessorHost.RegionEnvironment.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.RegionEnvironment.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">RegionCoprocessorHost.RegionEnvironment.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.RegionEnvironment.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">RegionServerCoprocessorHost.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
@@ -386,36 +386,36 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">RegionMergeTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
-<div class="block">Get the RegonServerServices of the server running the transaction or rollback</div>
-</td>
+<td class="colLast"><span class="strong">RegionServerCoprocessorHost.RegionServerEnvironment.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.RegionServerEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">RegionCoprocessorHost.RegionEnvironment.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.RegionEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">SplitTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
+<div class="block">Get the RegonServerServices of the server running the transaction or rollback</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">RegionCoprocessorHost.RegionEnvironment.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.RegionEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">RegionServerCoprocessorHost.RegionServerEnvironment.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.RegionServerEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">RegionMergeTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
+<div class="block">Get the RegonServerServices of the server running the transaction or rollback</div>
+</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">SplitTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">SplitTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
-<div class="block">Get the RegonServerServices of 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#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -453,23 +453,9 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
-<td class="colLast"><span class="strong">RegionMergeTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&nbsp;server,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
-<div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #execute(Server, RegionServerServices, User)</i></div>
-</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
 <td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
-<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,
@@ -481,21 +467,21 @@
 </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,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
-              <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
-<div class="block">Run the transaction.</div>
+<td class="colLast"><span class="strong">RegionMergeTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>use #execute(Server, RegionServerServices, User)</i></div>
+</div>
 </td>
 </tr>
 <tr class="altColor">
-<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>
+<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="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,%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,
+<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>
@@ -508,6 +494,20 @@
 </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,
+              <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>(package private) boolean</code></td>
 <td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#hasMergeQualifierInMeta(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20byte[])">hasMergeQualifierInMeta</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                                               byte[]&nbsp;regionName)</code>
@@ -596,13 +596,27 @@
 </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#prepare(org.apache.hadoop.hbase.regionserver.RegionServerServices)">prepare</a></strong>(<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">RegionMergeTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#prepare(org.apache.hadoop.hbase.regionserver.RegionServerServices)">prepare</a></strong>(<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">Check merge inputs and prepare the transaction.</div>
 </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)">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">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#prepare(org.apache.hadoop.hbase.regionserver.RegionServerServices)">prepare</a></strong>(<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">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); as of 1.0.2, remove in 3.0</i></div>
+</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
@@ -615,21 +629,21 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<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="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">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="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); as of 1.0.2, remove in 3.0</i></div>
-</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,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
+                <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
+<div class="block">Roll back a failed transaction</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -642,24 +656,10 @@
 </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>&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>boolean</code></td>
 <td class="colLast"><span class="strong">SplitTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                 <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">SplitTransaction.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&nbsp;server,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
-                <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
-<div class="block">Roll back a failed transaction</div>
-</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#stepsAfterPONR(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.regionserver.HRegion,%20org.apache.hadoop.hbase.security.User)">stepsAfterPONR</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&nbsp;server,
@@ -802,13 +802,13 @@
 <td class="colLast"><span class="strong">FinishRegionRecoveringHandler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/handler/FinishRegionRecoveringHandler.html#rss">rss</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">OpenRegionHandler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
 <td class="colLast"><span class="strong">CloseRegionHandler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span class="strong">OpenRegionHandler.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
 <td class="colLast"><span class="strong">OpenRegionHandler.PostOpenDeployTasksThread.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.PostOpenDeployTasksThread.html#services">services</a></strong></code>&nbsp;</td>
@@ -948,35 +948,35 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a></code></td>
-<td class="colLast"><span class="strong">CompactionThroughputControllerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/CompactionThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
+<td class="colLast"><span class="strong">FlushThroughputControllerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/FlushThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
             org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a></code></td>
-<td class="colLast"><span class="strong">FlushThroughputControllerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/FlushThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
+<td class="colLast"><span class="strong">CompactionThroughputControllerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/CompactionThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
             org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">NoLimitThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/NoLimitThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>
+<div class="block">Setup controller for the given region server.</div>
+</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><span class="strong">PressureAwareThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">PressureAwareCompactionThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">PressureAwareCompactionThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">PressureAwareFlushThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareFlushThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">PressureAwareFlushThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareFlushThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">NoLimitThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/NoLimitThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">ThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>
-<div class="block">Setup controller for the given region server.</div>
-</td>
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="strong">PressureAwareThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServicesForStores.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServicesForStores.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServicesForStores.html
index 7c77664..1e47aa0 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServicesForStores.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServicesForStores.html
@@ -121,11 +121,11 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServicesForStores.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServicesForStores</a></code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getRegionServicesForStores()">getRegionServicesForStores</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Region.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html#getRegionServicesForStores()">getRegionServicesForStores</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServicesForStores.html" title="class in org.apache.hadoop.hbase.regionserver">RegionServicesForStores</a></code></td>
-<td class="colLast"><span class="strong">Region.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html#getRegionServicesForStores()">getRegionServicesForStores</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getRegionServicesForStores()">getRegionServicesForStores</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RowProcessor.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RowProcessor.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RowProcessor.html
index cce6401..12e82bc 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RowProcessor.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RowProcessor.html
@@ -184,21 +184,15 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">Region.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor)</code>
 <div class="block">Performs atomic multiple reads and writes on a given row.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor,%20long,%20long)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor,
-                                        long&nbsp;nonceGroup,
-                                        long&nbsp;nonce)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">Region.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor,%20long,%20long)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor,
                                         long&nbsp;nonceGroup,
@@ -206,14 +200,13 @@
 <div class="block">Performs atomic multiple reads and writes on a given row.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor,%20long,%20long,%20long)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor,
-                                        long&nbsp;timeout,
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor,%20long,%20long)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor,
                                         long&nbsp;nonceGroup,
                                         long&nbsp;nonce)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">Region.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor,%20long,%20long,%20long)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor,
                                         long&nbsp;timeout,
@@ -222,6 +215,13 @@
 <div class="block">Performs atomic multiple reads and writes on a given row.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#processRowsWithLocks(org.apache.hadoop.hbase.regionserver.RowProcessor,%20long,%20long,%20long)">processRowsWithLocks</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RowProcessor.html" title="interface in org.apache.hadoop.hbase.regionserver">RowProcessor</a>&lt;?,?&gt;&nbsp;processor,
+                                        long&nbsp;timeout,
+                                        long&nbsp;nonceGroup,
+                                        long&nbsp;nonce)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/442e9121/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html
index e074440..20541e4 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html
@@ -136,11 +136,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a></code></td>
-<td class="colLast"><span class="strong">Store.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanInfo()">getScanInfo</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanInfo()">getScanInfo</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanInfo()">getScanInfo</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Store.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanInfo()">getScanInfo</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>


Mime
View raw message