hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [05/51] [partial] hbase-site git commit: Published site at c9ebcd4e296a31e0da43f513db3f5a8c3929c191.
Date Wed, 11 May 2016 15:56:31 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/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 5b69678..b811f4e 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
@@ -147,20 +147,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">ZkSplitLogWorkerCoordination.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coordination/ZkSplitLogWorkerCoordination.html#init(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.regionserver.SplitLogWorker.TaskExecutor,%20org.apache.hadoop.hbase.regionserver.SplitLogWorker)">init</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">SplitLogWorkerCoordination.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coordination/SplitLogWorkerCoordination.html#init(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.regionserver.SplitLogWorker.TaskExecutor,%20org.apache.hadoop.hbase.regionserver.SplitLogWorker)">init</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,
-        <a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.html" title="interface in org.apache.hadoop.hbase.regionserver">SplitLogWorker.TaskExecutor</a>&nbsp;splitExecutor,
+        <a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.html" title="interface in org.apache.hadoop.hbase.regionserver">SplitLogWorker.TaskExecutor</a>&nbsp;splitTaskExecutor,
         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.html" title="class in org.apache.hadoop.hbase.regionserver">SplitLogWorker</a>&nbsp;worker)</code>
-<div class="block">Override setter from <a href="../../../../../../org/apache/hadoop/hbase/coordination/SplitLogWorkerCoordination.html" title="interface in org.apache.hadoop.hbase.coordination"><code>SplitLogWorkerCoordination</code></a></div>
+<div class="block">Initialize internal values.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">SplitLogWorkerCoordination.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coordination/SplitLogWorkerCoordination.html#init(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.regionserver.SplitLogWorker.TaskExecutor,%20org.apache.hadoop.hbase.regionserver.SplitLogWorker)">init</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">ZkSplitLogWorkerCoordination.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coordination/ZkSplitLogWorkerCoordination.html#init(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.regionserver.SplitLogWorker.TaskExecutor,%20org.apache.hadoop.hbase.regionserver.SplitLogWorker)">init</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,
-        <a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.html" title="interface in org.apache.hadoop.hbase.regionserver">SplitLogWorker.TaskExecutor</a>&nbsp;splitTaskExecutor,
+        <a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.html" title="interface in org.apache.hadoop.hbase.regionserver">SplitLogWorker.TaskExecutor</a>&nbsp;splitExecutor,
         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.html" title="class in org.apache.hadoop.hbase.regionserver">SplitLogWorker</a>&nbsp;worker)</code>
-<div class="block">Initialize internal values.</div>
+<div class="block">Override setter from <a href="../../../../../../org/apache/hadoop/hbase/coordination/SplitLogWorkerCoordination.html" title="interface in org.apache.hadoop.hbase.coordination"><code>SplitLogWorkerCoordination</code></a></div>
 </td>
 </tr>
 </tbody>
@@ -347,14 +347,6 @@
 <td class="colLast"><span class="strong">SplitTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.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">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>(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>
@@ -366,6 +358,14 @@
 </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">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>
 <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="altColor">
@@ -391,19 +391,11 @@
 </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">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>(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="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">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">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">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="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>
@@ -412,11 +404,19 @@
 </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#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>
 </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">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -457,11 +457,6 @@
               <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/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,
               <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
@@ -470,7 +465,7 @@
 </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">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>
@@ -479,6 +474,11 @@
 </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,%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,
@@ -486,12 +486,6 @@
               <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><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,
               <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
@@ -499,7 +493,7 @@
 <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">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,
@@ -507,6 +501,12 @@
 <div class="block">Run the transaction.</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>
+</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,
@@ -596,14 +596,14 @@
 </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="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>
+</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,
@@ -611,11 +611,6 @@
 </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,
-                <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">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;
@@ -623,7 +618,7 @@
 </div>
 </td>
 </tr>
-<tr class="altColor">
+<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,
                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
@@ -632,6 +627,11 @@
 </div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="strong">RegionMergeTransactionImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>&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,%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,
@@ -640,19 +640,13 @@
 </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">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">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,
@@ -660,6 +654,12 @@
 <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">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>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>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="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="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>
@@ -941,36 +941,36 @@
 <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">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="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">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="altColor">
 <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>
-</tr>
-<tr class="rowColor">
-<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>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <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>
 </tr>
-<tr class="rowColor">
+<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>
 </tr>
-<tr class="altColor">
+<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>
 </tr>
+<tr class="altColor">
+<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>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
index 8035f5b..f85c7d3 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
@@ -96,7 +96,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#checkColumn(org.apache.hadoop.hbase.Cell,%20byte)">checkColumn</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+<td class="colLast"><span class="strong">ExplicitColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#checkColumn(org.apache.hadoop.hbase.Cell,%20byte)">checkColumn</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                       byte&nbsp;type)</code>
 <div class="block">Checks if the column is present in the list of requested columns by returning the match code
  instance.</div>
@@ -104,7 +104,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span class="strong">ExplicitColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#checkColumn(org.apache.hadoop.hbase.Cell,%20byte)">checkColumn</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+<td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#checkColumn(org.apache.hadoop.hbase.Cell,%20byte)">checkColumn</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                       byte&nbsp;type)</code>
 <div class="block">Checks if the column is present in the list of requested columns by returning the match code
  instance.</div>
@@ -137,6 +137,13 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
+<td class="colLast"><span class="strong">ExplicitColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#checkVersions(org.apache.hadoop.hbase.Cell,%20long,%20byte,%20boolean)">checkVersions</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+                          long&nbsp;timestamp,
+                          byte&nbsp;type,
+                          boolean&nbsp;ignoreCount)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
 <td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#checkVersions(org.apache.hadoop.hbase.Cell,%20long,%20byte,%20boolean)">checkVersions</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                           long&nbsp;ttl,
                           byte&nbsp;type,
@@ -144,13 +151,6 @@
 <div class="block">Keeps track of the number of versions for the columns asked for.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span class="strong">ExplicitColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#checkVersions(org.apache.hadoop.hbase.Cell,%20long,%20byte,%20boolean)">checkVersions</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
-                          long&nbsp;timestamp,
-                          byte&nbsp;type,
-                          boolean&nbsp;ignoreCount)</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
 <td class="colLast"><span class="strong">ScanWildcardColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanWildcardColumnTracker.html#checkVersions(org.apache.hadoop.hbase.Cell,%20long,%20byte,%20boolean)">checkVersions</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
@@ -162,13 +162,13 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#getNextRowOrNextColumn(org.apache.hadoop.hbase.Cell)">getNextRowOrNextColumn</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</code>
-<div class="block">Retrieve the MatchCode for the next row or column</div>
-</td>
+<td class="colLast"><span class="strong">ExplicitColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#getNextRowOrNextColumn(org.apache.hadoop.hbase.Cell)">getNextRowOrNextColumn</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span class="strong">ExplicitColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#getNextRowOrNextColumn(org.apache.hadoop.hbase.Cell)">getNextRowOrNextColumn</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#getNextRowOrNextColumn(org.apache.hadoop.hbase.Cell)">getNextRowOrNextColumn</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</code>
+<div class="block">Retrieve the MatchCode for the next row or column</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanType.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanType.html
index 3985cf6..94597c4 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanType.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanType.html
@@ -406,11 +406,11 @@ the order they are declared.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanType</a></code></td>
-<td class="colLast"><span class="strong">Compactor.InternalScannerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.InternalScannerFactory.html#getScanType(org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest)">getScanType</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">StripeCompactor.StripeInternalScannerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.StripeInternalScannerFactory.html#getScanType(org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest)">getScanType</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanType</a></code></td>
-<td class="colLast"><span class="strong">StripeCompactor.StripeInternalScannerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.StripeInternalScannerFactory.html#getScanType(org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest)">getScanType</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Compactor.InternalScannerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.InternalScannerFactory.html#getScanType(org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest)">getScanType</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -423,14 +423,14 @@ the order they are declared.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">InternalScanner</a></code></td>
-<td class="colLast"><span class="strong">Compactor.InternalScannerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.InternalScannerFactory.html#createScanner(java.util.List,%20org.apache.hadoop.hbase.regionserver.ScanType,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails,%20long)">createScanner</a></strong>(<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/StoreFileScanner.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileScanner</a>&gt;&nbsp;scanners,
+<td class="colLast"><span class="strong">StripeCompactor.StripeInternalScannerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.StripeInternalScannerFactory.html#createScanner(java.util.List,%20org.apache.hadoop.hbase.regionserver.ScanType,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails,%20long)">createScanner</a></strong>(<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/StoreFileScanner.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileScanner</a>&gt;&nbsp;scanners,
                           <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanType</a>&nbsp;scanType,
                           <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a>&nbsp;fd,
                           long&nbsp;smallestReadPoint)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">InternalScanner</a></code></td>
-<td class="colLast"><span class="strong">StripeCompactor.StripeInternalScannerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.StripeInternalScannerFactory.html#createScanner(java.util.List,%20org.apache.hadoop.hbase.regionserver.ScanType,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails,%20long)">createScanner</a></strong>(<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/StoreFileScanner.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileScanner</a>&gt;&nbsp;scanners,
+<td class="colLast"><span class="strong">Compactor.InternalScannerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.InternalScannerFactory.html#createScanner(java.util.List,%20org.apache.hadoop.hbase.regionserver.ScanType,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails,%20long)">createScanner</a></strong>(<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/StoreFileScanner.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileScanner</a>&gt;&nbsp;scanners,
                           <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver">ScanType</a>&nbsp;scanType,
                           <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a>&nbsp;fd,
                           long&nbsp;smallestReadPoint)</code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.LimitScope.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.LimitScope.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.LimitScope.html
index ee668a4..6bc9821 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.LimitScope.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.LimitScope.html
@@ -165,35 +165,35 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
-<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#checkAnyLimitReached(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkAnyLimitReached</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#checkAnyLimitReached(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkAnyLimitReached</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
-<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#checkAnyLimitReached(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkAnyLimitReached</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#checkAnyLimitReached(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkAnyLimitReached</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
-<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#checkBatchLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkBatchLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#checkBatchLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkBatchLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
-<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#checkBatchLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkBatchLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#checkBatchLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkBatchLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
-<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#checkSizeLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkSizeLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#checkSizeLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkSizeLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
-<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#checkSizeLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkSizeLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#checkSizeLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkSizeLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
-<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#checkTimeLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkTimeLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#checkTimeLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkTimeLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
-<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#checkTimeLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkTimeLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#checkTimeLimit(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">checkTimeLimit</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;checkerScope)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
@@ -228,11 +228,11 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) void</code></td>
-<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#setSizeLimitScope(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">setSizeLimitScope</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;scope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#setSizeLimitScope(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">setSizeLimitScope</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;scope)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) void</code></td>
-<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#setSizeLimitScope(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">setSizeLimitScope</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;scope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#setSizeLimitScope(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">setSizeLimitScope</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;scope)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) void</code></td>
@@ -247,11 +247,11 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) void</code></td>
-<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#setTimeLimitScope(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">setTimeLimitScope</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;scope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#setTimeLimitScope(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">setTimeLimitScope</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;scope)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) void</code></td>
-<td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#setTimeLimitScope(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">setTimeLimitScope</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;scope)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#setTimeLimitScope(org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope)">setTimeLimitScope</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.LimitScope</a>&nbsp;scope)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.NextState.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.NextState.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.NextState.html
index 37b4a41..9d0e289 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.NextState.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScannerContext.NextState.html
@@ -116,14 +116,14 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a></code></td>
-<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#setScannerState(org.apache.hadoop.hbase.regionserver.ScannerContext.NextState)">setScannerState</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a>&nbsp;state)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a></code></td>
 <td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#setScannerState(org.apache.hadoop.hbase.regionserver.ScannerContext.NextState)">setScannerState</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a>&nbsp;state)</code>
 <div class="block">Note that this is not a typical setter.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a></code></td>
+<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#setScannerState(org.apache.hadoop.hbase.regionserver.ScannerContext.NextState)">setScannerState</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a>&nbsp;state)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a></code></td>
 <td class="colLast"><span class="strong">ScannerContext.NextState.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html#valueOf(java.lang.String)">valueOf</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
@@ -156,14 +156,14 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a></code></td>
-<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#setScannerState(org.apache.hadoop.hbase.regionserver.ScannerContext.NextState)">setScannerState</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a>&nbsp;state)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a></code></td>
 <td class="colLast"><span class="strong">ScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.html#setScannerState(org.apache.hadoop.hbase.regionserver.ScannerContext.NextState)">setScannerState</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a>&nbsp;state)</code>
 <div class="block">Note that this is not a typical setter.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a></code></td>
+<td class="colLast"><span class="strong">NoLimitScannerContext.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/NoLimitScannerContext.html#setScannerState(org.apache.hadoop.hbase.regionserver.ScannerContext.NextState)">setScannerState</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver">ScannerContext.NextState</a>&nbsp;state)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>


Mime
View raw message