http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html 
b/devapidocs/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
index ab028a2..b738b29 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre><a 
href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
-class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.41">AsyncTableResultScanner</a>
+class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.40">AsyncTableResultScanner</a>
 extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>
 implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" 
title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html" 
title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer</a></pre>
 <div class="block">The <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" 
title="interface in 
org.apache.hadoop.hbase.client"><code>ResultScanner</code></a> implementation 
for <a href="../../../../../org/apache/hadoop/hbase/client/AsyncTable.html" 
title="interface in 
org.apache.hadoop.hbase.client"><code>AsyncTable</code></a>. It will fetch data 
automatically
@@ -186,6 +186,10 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#resumer">resumer</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in 
org.apache.hadoop.hbase.client">Scan</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#scan">scan</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in 
org.apache.hadoop.hbase.client.metrics">ScanMetrics</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#scanMetrics">scanMetrics</a></span></code>&nbsp;</td>
 </tr>
@@ -262,8 +266,8 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#onHeartbeat-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-">onHeartbeat</a></span>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</code>
-<div class="block">Indicate that there is an heartbeat message but we have not 
cumulated enough cells to call
- onNext.</div>
+<div class="block">Indicate that there is a heartbeat message but we have not 
cumulated enough cells to call
+ <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-"><code>RawScanResultConsumer.onNext(Result[],
 ScanController)</code></a>.</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
@@ -337,7 +341,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.apache.commons.logging.Log <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.43">LOG</a></pre>
+<pre>private static final&nbsp;org.apache.commons.logging.Log <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.42">LOG</a></pre>
 </li>
 </ul>
 <a name="rawTable">
@@ -346,7 +350,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>rawTable</h4>
-<pre>private final&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.html" 
title="interface in org.apache.hadoop.hbase.client">RawAsyncTable</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.45">rawTable</a></pre>
+<pre>private final&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.html" 
title="interface in org.apache.hadoop.hbase.client">RawAsyncTable</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.44">rawTable</a></pre>
 </li>
 </ul>
 <a name="maxCacheSize">
@@ -355,7 +359,16 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>maxCacheSize</h4>
-<pre>private final&nbsp;long <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.47">maxCacheSize</a></pre>
+<pre>private final&nbsp;long <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.46">maxCacheSize</a></pre>
+</li>
+</ul>
+<a name="scan">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scan</h4>
+<pre>private final&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in 
org.apache.hadoop.hbase.client">Scan</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.48">scan</a></pre>
 </li>
 </ul>
 <a name="queue">
@@ -364,7 +377,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>queue</h4>
-<pre>private final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Queue.html?is-external=true";
 title="class or interface in java.util">Queue</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a>&gt; <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.49">queue</a></pre>
+<pre>private final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Queue.html?is-external=true";
 title="class or interface in java.util">Queue</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a>&gt; <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.50">queue</a></pre>
 </li>
 </ul>
 <a name="scanMetrics">
@@ -373,7 +386,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>scanMetrics</h4>
-<pre>private&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in org.apache.hadoop.hbase.client.metrics">ScanMetrics</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.51">scanMetrics</a></pre>
+<pre>private&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in org.apache.hadoop.hbase.client.metrics">ScanMetrics</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.52">scanMetrics</a></pre>
 </li>
 </ul>
 <a name="cacheSize">
@@ -382,7 +395,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>cacheSize</h4>
-<pre>private&nbsp;long <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.53">cacheSize</a></pre>
+<pre>private&nbsp;long <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.54">cacheSize</a></pre>
 </li>
 </ul>
 <a name="closed">
@@ -391,7 +404,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>closed</h4>
-<pre>private&nbsp;boolean <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.55">closed</a></pre>
+<pre>private&nbsp;boolean <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.56">closed</a></pre>
 </li>
 </ul>
 <a name="error">
@@ -400,7 +413,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>error</h4>
-<pre>private&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.57">error</a></pre>
+<pre>private&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.58">error</a></pre>
 </li>
 </ul>
 <a name="resumer">
@@ -409,7 +422,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>resumer</h4>
-<pre>private&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanResumer.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanResumer</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.59">resumer</a></pre>
+<pre>private&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanResumer.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanResumer</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.60">resumer</a></pre>
 </li>
 </ul>
 </li>
@@ -426,7 +439,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>AsyncTableResultScanner</h4>
-<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.61">AsyncTableResultScanner</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.html" 
title="interface in 
org.apache.hadoop.hbase.client">RawAsyncTable</a>&nbsp;table,
+<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.62">AsyncTableResultScanner</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.html" 
title="interface in 
org.apache.hadoop.hbase.client">RawAsyncTable</a>&nbsp;table,
                                <a 
href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in 
org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
                                long&nbsp;maxCacheSize)</pre>
 </li>
@@ -445,7 +458,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>addToCache</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.67">addToCache</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a>&nbsp;result)</pre>
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.69">addToCache</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a>&nbsp;result)</pre>
 </li>
 </ul>
 <a 
name="stopPrefetch-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-">
@@ -454,7 +467,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>stopPrefetch</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.72">stopPrefetch</a>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</pre>
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.74">stopPrefetch</a>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</pre>
 </li>
 </ul>
 <a 
name="onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-">
@@ -463,7 +476,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>onNext</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.82">onNext</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a>[]&nbsp;results,
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.84">onNext</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a>[]&nbsp;results,
                    <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-">RawScanResultConsumer</a></code></span></div>
 <div class="block">Indicate that we have receive some data.</div>
@@ -484,10 +497,17 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>onHeartbeat</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.98">onHeartbeat</a>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.100">onHeartbeat</a>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onHeartbeat-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-">RawScanResultConsumer</a></code></span></div>
-<div class="block">Indicate that there is an heartbeat message but we have not 
cumulated enough cells to call
- onNext.
+<div class="block">Indicate that there is a heartbeat message but we have not 
cumulated enough cells to call
+ <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-"><code>RawScanResultConsumer.onNext(Result[],
 ScanController)</code></a>.
+ <p>
+ Note that this method will always be called when RS returns something to us 
but we do not have
+ enough cells to call <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-"><code>RawScanResultConsumer.onNext(Result[],
 ScanController)</code></a>. Sometimes it may not be a
+ 'heartbeat' message for RS, for example, we have a large row with many cells 
and size limit is
+ exceeded before sending all the cells for this row. For RS it does send some 
data to us and the
+ time limit has not been reached, but we can not return the data to client so 
here we call this
+ method to tell client we have already received something.
  <p>
  This method give you a chance to terminate a slow scan operation.</div>
 <dl>
@@ -506,7 +526,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>onError</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.105">onError</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a>&nbsp;error)</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.111">onError</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a>&nbsp;error)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onError-java.lang.Throwable-">RawScanResultConsumer</a></code></span></div>
 <div class="block">Indicate that we hit an unrecoverable error and the scan 
operation is terminated.
  <p>
@@ -523,7 +543,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>onComplete</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.111">onComplete</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.117">onComplete</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onComplete--">RawScanResultConsumer</a></code></span></div>
 <div class="block">Indicate that the scan operation is completed 
normally.</div>
 <dl>
@@ -538,7 +558,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>onScanMetricsCreated</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.117">onScanMetricsCreated</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in 
org.apache.hadoop.hbase.client.metrics">ScanMetrics</a>&nbsp;scanMetrics)</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.123">onScanMetricsCreated</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in 
org.apache.hadoop.hbase.client.metrics">ScanMetrics</a>&nbsp;scanMetrics)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onScanMetricsCreated-org.apache.hadoop.hbase.client.metrics.ScanMetrics-">RawScanResultConsumer</a></code></span></div>
 <div class="block">If <code>scan.isScanMetricsEnabled()</code> returns true, 
then this method will be called prior to
  all other methods in this interface to give you the <a 
href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in 
org.apache.hadoop.hbase.client.metrics"><code>ScanMetrics</code></a> instance 
for this scan
@@ -556,7 +576,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>resumePrefetch</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.121">resumePrefetch</a>()</pre>
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.127">resumePrefetch</a>()</pre>
 </li>
 </ul>
 <a name="next--">
@@ -565,7 +585,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>next</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.130">next</a>()
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.136">next</a>()
             throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html#next--">ResultScanner</a></code></span></div>
 <div class="block">Grab the next row's worth of values. The scanner will 
return a Result.</div>
@@ -585,7 +605,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>close</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.154">close</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.162">close</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html#close--">ResultScanner</a></code></span></div>
 <div class="block">Closes the scanner and releases any resources it has 
allocated</div>
 <dl>
@@ -604,7 +624,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>renewLease</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.165">renewLease</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.173">renewLease</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html#renewLease--">ResultScanner</a></code></span></div>
 <div class="block">Allow the client to renew the scanner's lease on the 
server.</div>
 <dl>
@@ -621,7 +641,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockList">
 <li class="blockList">
 <h4>isSuspended</h4>
-<pre>boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.173">isSuspended</a>()</pre>
+<pre>boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.181">isSuspended</a>()</pre>
 </li>
 </ul>
 <a name="getScanMetrics--">
@@ -630,7 +650,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getScanMetrics</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in org.apache.hadoop.hbase.client.metrics">ScanMetrics</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.178">getScanMetrics</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in org.apache.hadoop.hbase.client.metrics">ScanMetrics</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#line.186">getScanMetrics</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html#getScanMetrics--">getScanMetrics</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" 
title="interface in 
org.apache.hadoop.hbase.client">ResultScanner</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/RawScanResultConsumer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/RawScanResultConsumer.html 
b/devapidocs/org/apache/hadoop/hbase/client/RawScanResultConsumer.html
index c783528..f608987 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/RawScanResultConsumer.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/RawScanResultConsumer.html
@@ -174,8 +174,8 @@ public interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>default void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onHeartbeat-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-">onHeartbeat</a></span>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</code>
-<div class="block">Indicate that there is an heartbeat message but we have not 
cumulated enough cells to call
- onNext.</div>
+<div class="block">Indicate that there is a heartbeat message but we have not 
cumulated enough cells to call
+ <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-"><code>onNext(Result[],
 ScanController)</code></a>.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
@@ -232,9 +232,16 @@ public interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client
 <ul class="blockList">
 <li class="blockList">
 <h4>onHeartbeat</h4>
-<pre>default&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/RawScanResultConsumer.html#line.106">onHeartbeat</a>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</pre>
-<div class="block">Indicate that there is an heartbeat message but we have not 
cumulated enough cells to call
- onNext.
+<pre>default&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/RawScanResultConsumer.html#line.113">onHeartbeat</a>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</pre>
+<div class="block">Indicate that there is a heartbeat message but we have not 
cumulated enough cells to call
+ <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-"><code>onNext(Result[],
 ScanController)</code></a>.
+ <p>
+ Note that this method will always be called when RS returns something to us 
but we do not have
+ enough cells to call <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-"><code>onNext(Result[],
 ScanController)</code></a>. Sometimes it may not be a
+ 'heartbeat' message for RS, for example, we have a large row with many cells 
and size limit is
+ exceeded before sending all the cells for this row. For RS it does send some 
data to us and the
+ time limit has not been reached, but we can not return the data to client so 
here we call this
+ method to tell client we have already received something.
  <p>
  This method give you a chance to terminate a slow scan operation.</div>
 <dl>
@@ -251,7 +258,7 @@ public interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client
 <ul class="blockList">
 <li class="blockList">
 <h4>onError</h4>
-<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/RawScanResultConsumer.html#line.114">onError</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a>&nbsp;error)</pre>
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/RawScanResultConsumer.html#line.121">onError</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a>&nbsp;error)</pre>
 <div class="block">Indicate that we hit an unrecoverable error and the scan 
operation is terminated.
  <p>
  We will not call <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onComplete--"><code>onComplete()</code></a>
 after calling <a 
href="../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onError-java.lang.Throwable-"><code>onError(Throwable)</code></a>.</div>
@@ -263,7 +270,7 @@ public interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client
 <ul class="blockList">
 <li class="blockList">
 <h4>onComplete</h4>
-<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/RawScanResultConsumer.html#line.119">onComplete</a>()</pre>
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/RawScanResultConsumer.html#line.126">onComplete</a>()</pre>
 <div class="block">Indicate that the scan operation is completed 
normally.</div>
 </li>
 </ul>
@@ -273,7 +280,7 @@ public interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client
 <ul class="blockListLast">
 <li class="blockList">
 <h4>onScanMetricsCreated</h4>
-<pre>default&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/RawScanResultConsumer.html#line.127">onScanMetricsCreated</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in 
org.apache.hadoop.hbase.client.metrics">ScanMetrics</a>&nbsp;scanMetrics)</pre>
+<pre>default&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/RawScanResultConsumer.html#line.134">onScanMetricsCreated</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in 
org.apache.hadoop.hbase.client.metrics">ScanMetrics</a>&nbsp;scanMetrics)</pre>
 <div class="block">If <code>scan.isScanMetricsEnabled()</code> returns true, 
then this method will be called prior to
  all other methods in this interface to give you the <a 
href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in 
org.apache.hadoop.hbase.client.metrics"><code>ScanMetrics</code></a> instance 
for this scan
  operation. The <a 
href="../../../../../org/apache/hadoop/hbase/client/metrics/ScanMetrics.html" 
title="class in 
org.apache.hadoop.hbase.client.metrics"><code>ScanMetrics</code></a> instance 
will be updated on-the-fly during the scan, you can

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncNonMetaRegionLocator.LocateRequest.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncNonMetaRegionLocator.LocateRequest.html
 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncNonMetaRegionLocator.LocateRequest.html
index 432915c..6aa3b88 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncNonMetaRegionLocator.LocateRequest.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncNonMetaRegionLocator.LocateRequest.html
@@ -115,6 +115,19 @@
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a 
href="../../../../../../org/apache/hadoop/hbase/client/package-summary.html">org.apache.hadoop.hbase.client</a>
 that return types with arguments of type <a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.LocateRequest.html"
 title="class in 
org.apache.hadoop.hbase.client">AsyncNonMetaRegionLocator.LocateRequest</a></span><span
 class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true";
 title="class or interface in java.util">Optional</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.LocateRequest.html"
 title="class in 
org.apache.hadoop.hbase.client">AsyncNonMetaRegionLocator.LocateRequest</a>&gt;</code></td>
+<td class="colLast"><span 
class="typeNameLabel">AsyncNonMetaRegionLocator.TableCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.TableCache.html#getCandidate--">getCandidate</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing methods, and an explanation">
 <caption><span>Methods in <a 
href="../../../../../../org/apache/hadoop/hbase/client/package-summary.html">org.apache.hadoop.hbase.client</a>
 with parameters of type <a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.LocateRequest.html"
 title="class in 
org.apache.hadoop.hbase.client">AsyncNonMetaRegionLocator.LocateRequest</a></span><span
 class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -150,9 +163,9 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private boolean</code></td>
-<td class="colLast"><span 
class="typeNameLabel">AsyncNonMetaRegionLocator.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.html#tryComplete-org.apache.hadoop.hbase.client.AsyncNonMetaRegionLocator.LocateRequest-java.util.concurrent.CompletableFuture-org.apache.hadoop.hbase.HRegionLocation-">tryComplete</a></span>(<a
 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.LocateRequest.html"
 title="class in 
org.apache.hadoop.hbase.client">AsyncNonMetaRegionLocator.LocateRequest</a>&nbsp;req,
+<td class="colLast"><span 
class="typeNameLabel">AsyncNonMetaRegionLocator.TableCache.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.TableCache.html#tryComplete-org.apache.hadoop.hbase.client.AsyncNonMetaRegionLocator.LocateRequest-java.util.concurrent.CompletableFuture-java.util.Optional-">tryComplete</a></span>(<a
 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.LocateRequest.html"
 title="class in 
org.apache.hadoop.hbase.client">AsyncNonMetaRegionLocator.LocateRequest</a>&nbsp;req,
            <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true";
 title="class or interface in java.util.concurrent">CompletableFuture</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/HRegionLocation.html" 
title="class in org.apache.hadoop.hbase">HRegionLocation</a>&gt;&nbsp;future,
-           <a 
href="../../../../../../org/apache/hadoop/hbase/HRegionLocation.html" 
title="class in 
org.apache.hadoop.hbase">HRegionLocation</a>&nbsp;loc)</code>&nbsp;</td>
+           <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true";
 title="class or interface in java.util">Optional</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/HRegionLocation.html" 
title="class in 
org.apache.hadoop.hbase">HRegionLocation</a>&gt;&nbsp;location)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/class-use/Cursor.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Cursor.html 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/Cursor.html
index a76ffcb..e7ef889 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Cursor.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Cursor.html
@@ -203,6 +203,17 @@
 </tr>
 </tbody>
 </table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructor parameters in <a 
href="../../../../../../org/apache/hadoop/hbase/client/package-summary.html">org.apache.hadoop.hbase.client</a>
 with type arguments of type <a 
href="../../../../../../org/apache/hadoop/hbase/client/Cursor.html" 
title="class in org.apache.hadoop.hbase.client">Cursor</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerImpl.html#ScanControllerImpl-java.util.Optional-">ScanControllerImpl</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true";
 title="class or interface in java.util">Optional</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/client/Cursor.html" 
title="class in 
org.apache.hadoop.hbase.client">Cursor</a>&gt;&nbsp;cursor)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/class-use/RawScanResultConsumer.ScanController.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/class-use/RawScanResultConsumer.ScanController.html
 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/RawScanResultConsumer.ScanController.html
index 2b85f01..a7dc47f 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/client/class-use/RawScanResultConsumer.ScanController.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/RawScanResultConsumer.ScanController.html
@@ -147,8 +147,8 @@
 <tr class="rowColor">
 <td class="colFirst"><code>default void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">RawScanResultConsumer.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onHeartbeat-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-">onHeartbeat</a></span>(<a
 
href="../../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.ScanController.html"
 title="interface in 
org.apache.hadoop.hbase.client">RawScanResultConsumer.ScanController</a>&nbsp;controller)</code>
-<div class="block">Indicate that there is an heartbeat message but we have not 
cumulated enough cells to call
- onNext.</div>
+<div class="block">Indicate that there is a heartbeat message but we have not 
cumulated enough cells to call
+ <a 
href="../../../../../../org/apache/hadoop/hbase/client/RawScanResultConsumer.html#onNext-org.apache.hadoop.hbase.client.Result:A-org.apache.hadoop.hbase.client.RawScanResultConsumer.ScanController-"><code>RawScanResultConsumer.onNext(Result[],
 ScanController)</code></a>.</div>
 </td>
 </tr>
 <tr class="altColor">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
index b446a2e..05cccb6 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
@@ -279,29 +279,33 @@ service.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ScannerCallableWithReplicas.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.html#scan">scan</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">AsyncTableResultScanner.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncTableResultScanner.html#scan">scan</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">ScannerCallableWithReplicas.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.html#scan">scan</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ClientScanner.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ClientScanner.html#scan">scan</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">AsyncClientScanner.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncClientScanner.html#scan">scan</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">AsyncRpcRetryingCallerFactory.ScanSingleRegionCallerBuilder.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ScanSingleRegionCallerBuilder.html#scan">scan</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">AsyncScanSingleRegionRpcRetryingCaller.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.html#scan">scan</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ScannerCallable.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ScannerCallable.html#scan">scan</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">TableSnapshotScanner.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/TableSnapshotScanner.html#scan">scan</a></span></code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/class-use/Table.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Table.html 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/Table.html
index ef0a8f7..551c4a8 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Table.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Table.html
@@ -1179,6 +1179,12 @@ service.</div>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private static void</code></td>
+<td class="colLast"><span 
class="typeNameLabel">AccessControlLists.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlLists.html#removePermissionRecord-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.security.access.UserPermission-org.apache.hadoop.hbase.client.Table-">removePermissionRecord</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                      <a 
href="../../../../../../org/apache/hadoop/hbase/security/access/UserPermission.html"
 title="class in 
org.apache.hadoop.hbase.security.access">UserPermission</a>&nbsp;userPerm,
+                      <a 
href="../../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in 
org.apache.hadoop.hbase.client">Table</a>&nbsp;t)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>(package private) static void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">AccessControlLists.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlLists.html#removeTablePermissions-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.TableName-byte:A-org.apache.hadoop.hbase.client.Table-">removeTablePermissions</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                       <a 
href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -1187,7 +1193,7 @@ service.</div>
 <div class="block">Remove specified table column from the acl table.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>(package private) static void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">AccessControlLists.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlLists.html#removeTablePermissions-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.client.Table-">removeTablePermissions</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                       <a 
href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -1195,14 +1201,14 @@ service.</div>
 <div class="block">Remove specified table from the _acl_ table.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private static void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">AccessControlLists.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlLists.html#removeTablePermissions-org.apache.hadoop.hbase.TableName-byte:A-org.apache.hadoop.hbase.client.Table-boolean-">removeTablePermissions</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class 
in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                       byte[]&nbsp;column,
                       <a 
href="../../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table,
                       boolean&nbsp;closeTable)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>(package private) static void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">AccessControlLists.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlLists.html#removeUserPermission-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.security.access.UserPermission-org.apache.hadoop.hbase.client.Table-">removeUserPermission</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                     <a 
href="../../../../../../org/apache/hadoop/hbase/security/access/UserPermission.html"
 title="class in 
org.apache.hadoop.hbase.security.access">UserPermission</a>&nbsp;userPerm,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/class-use/TableDescriptor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/class-use/TableDescriptor.html 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/TableDescriptor.html
index 85f16c4..bad64ea 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/TableDescriptor.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/TableDescriptor.html
@@ -160,7 +160,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/HTableDescriptor.html" 
title="class in org.apache.hadoop.hbase">HTableDescriptor</a></span></code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">As of release 2.0.0, this 
will be removed in HBase 3.0.0.
-             use <a 
href="../../../../../../org/apache/hadoop/hbase/client/TableDescriptorBuilder.html"
 title="class in 
org.apache.hadoop.hbase.client"><code>TableDescriptorBuilder</code></a> to 
build <a href="../../../../../../org/apache/hadoop/hbase/HTableDescriptor.html" 
title="class in 
org.apache.hadoop.hbase"><code>HTableDescriptor</code></a>.</span></div>
+             Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/TableDescriptorBuilder.html"
 title="class in 
org.apache.hadoop.hbase.client"><code>TableDescriptorBuilder</code></a> to 
build <a href="../../../../../../org/apache/hadoop/hbase/HTableDescriptor.html" 
title="class in 
org.apache.hadoop.hbase"><code>HTableDescriptor</code></a>.</span></div>
 </div>
 </td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html 
b/devapidocs/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html
index c45469d..ad02a9f 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html
@@ -139,7 +139,9 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_FILTERED_KEY">COUNT_OF_ROWS_FILTERED_KEY</a></span></code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME"><code>COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME</code></a>
 instead</span></div>
+<div class="block"><span class="deprecationComment">As of release 2.0.0, this 
will be removed in HBase 3.0.0
+             (<a 
href="https://issues.apache.org/jira/browse/HBASE-17886";>HBASE-17886</a>).
+             Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME"><code>COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME</code></a>.</span></div>
 </div>
 </td>
 </tr>
@@ -151,7 +153,9 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_SCANNED_KEY">COUNT_OF_ROWS_SCANNED_KEY</a></span></code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME"><code>COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME</code></a>
 instead</span></div>
+<div class="block"><span class="deprecationComment">As of release 2.0.0, this 
will be removed in HBase 3.0.0
+             (<a 
href="https://issues.apache.org/jira/browse/HBASE-17886";>HBASE-17886</a>).
+             Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME"><code>COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME</code></a>.</span></div>
 </div>
 </td>
 </tr>
@@ -309,8 +313,11 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>COUNT_OF_ROWS_SCANNED_KEY</h4>
-<pre>public static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.53">COUNT_OF_ROWS_SCANNED_KEY</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span 
class="deprecationComment">Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME"><code>COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME</code></a>
 instead</span></div>
+<pre><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true";
 title="class or interface in java.lang">@Deprecated</a>
+public static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.58">COUNT_OF_ROWS_SCANNED_KEY</a></pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span 
class="deprecationComment">As of release 2.0.0, this will be removed in HBase 
3.0.0
+             (<a 
href="https://issues.apache.org/jira/browse/HBASE-17886";>HBASE-17886</a>).
+             Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME"><code>COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME</code></a>.</span></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.client.metrics.ServerSideScanMetrics.COUNT_OF_ROWS_SCANNED_KEY">Constant
 Field Values</a></dd>
@@ -323,8 +330,11 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>COUNT_OF_ROWS_FILTERED_KEY</h4>
-<pre>public static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.55">COUNT_OF_ROWS_FILTERED_KEY</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span 
class="deprecationComment">Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME"><code>COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME</code></a>
 instead</span></div>
+<pre><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true";
 title="class or interface in java.lang">@Deprecated</a>
+public static final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.66">COUNT_OF_ROWS_FILTERED_KEY</a></pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span 
class="deprecationComment">As of release 2.0.0, this will be removed in HBase 
3.0.0
+             (<a 
href="https://issues.apache.org/jira/browse/HBASE-17886";>HBASE-17886</a>).
+             Use <a 
href="../../../../../../org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME"><code>COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME</code></a>.</span></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.client.metrics.ServerSideScanMetrics.COUNT_OF_ROWS_FILTERED_KEY">Constant
 Field Values</a></dd>
@@ -337,7 +347,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>countOfRowsFiltered</h4>
-<pre>public final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.60">countOfRowsFiltered</a></pre>
+<pre>public final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.71">countOfRowsFiltered</a></pre>
 <div class="block">number of rows filtered during scan RPC</div>
 </li>
 </ul>
@@ -347,7 +357,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>countOfRowsScanned</h4>
-<pre>public final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.66">countOfRowsScanned</a></pre>
+<pre>public final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.77">countOfRowsScanned</a></pre>
 <div class="block">number of rows scanned during scan RPC. Not every row 
scanned will be returned to the client
  since rows may be filtered.</div>
 </li>
@@ -399,7 +409,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setCounter</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.72">setCounter</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;counterName,
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.83">setCounter</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;counterName,
                        long&nbsp;value)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -414,7 +424,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>hasCounter</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.83">hasCounter</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;counterName)</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.94">hasCounter</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;counterName)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>counterName</code> - </dd>
@@ -429,7 +439,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getCounter</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in 
java.util.concurrent.atomic">AtomicLong</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.91">getCounter</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;counterName)</pre>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in 
java.util.concurrent.atomic">AtomicLong</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.102">getCounter</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;counterName)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>counterName</code> - </dd>
@@ -444,7 +454,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>addToCounter</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.99">addToCounter</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;counterName,
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.110">addToCounter</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;counterName,
                          long&nbsp;delta)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -459,7 +469,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getMetricsMap</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">Map</a>&lt;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>,<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.111">getMetricsMap</a>()</pre>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">Map</a>&lt;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>,<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.122">getMetricsMap</a>()</pre>
 <div class="block">Get all of the values since the last time this function was 
called. Calling this function will
  reset all AtomicLongs in the instance back to 0.</div>
 <dl>
@@ -474,7 +484,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getMetricsMap</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">Map</a>&lt;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>,<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.120">getMetricsMap</a>(boolean&nbsp;reset)</pre>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">Map</a>&lt;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>,<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.html#line.131">getMetricsMap</a>(boolean&nbsp;reset)</pre>
 <div class="block">Get all of the values. If reset is true, we will reset the 
all AtomicLongs back to 0.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1ada5f22/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index 2601fed..3af42aa 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -538,25 +538,25 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">HBaseAdmin.ReplicationState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">SnapshotType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RegionLocateType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MasterSwitchType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">IsolationLevel</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Consistency</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Durability.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Scan.ReadType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RequestController.ReturnCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">TableState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Consistency</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MasterSwitchType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RegionLocateType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">HBaseAdmin.ReplicationState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
 </ul>
 </li>
 </ul>

Reply via email to