http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html
 
b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html
index 7deca6c..1acadd1 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html
@@ -107,7 +107,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre><a 
href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Public.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceAudience.Public</a>
  <a 
href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Evolving.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceStability.Evolving</a>
-public static interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutator.html#line.127">BufferedMutator.ExceptionListener</a></pre>
+public static interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutator.html#line.137">BufferedMutator.ExceptionListener</a></pre>
 <div class="block">Listens for asynchronous exceptions on a <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" 
title="interface in 
org.apache.hadoop.hbase.client"><code>BufferedMutator</code></a>.</div>
 </li>
 </ul>
@@ -153,7 +153,7 @@ public static interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase
 <ul class="blockListLast">
 <li class="blockList">
 <h4>onException</h4>
-<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html#line.128">onException</a>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html"
 title="class in 
org.apache.hadoop.hbase.client">RetriesExhaustedWithDetailsException</a>&nbsp;exception,
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html#line.138">onException</a>(<a
 
href="../../../../../org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html"
 title="class in 
org.apache.hadoop.hbase.client">RetriesExhaustedWithDetailsException</a>&nbsp;exception,
                  <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" 
title="interface in 
org.apache.hadoop.hbase.client">BufferedMutator</a>&nbsp;mutator)
           throws <a 
href="../../../../../org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html"
 title="class in 
org.apache.hadoop.hbase.client">RetriesExhaustedWithDetailsException</a></pre>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html 
b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html
index 99260f2..8347580 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -230,6 +230,18 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
 <div class="block">Sends a <a 
href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class 
in org.apache.hadoop.hbase.client"><code>Mutation</code></a> to the table.</div>
 </td>
 </tr>
+<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/BufferedMutator.html#setOperationTimeout-int-">setOperationTimeout</a></span>(int&nbsp;timeout)</code>
+<div class="block">Set operation timeout for this mutator instance</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#setRpcTimeout-int-">setRpcTimeout</a></span>(int&nbsp;timeout)</code>
+<div class="block">Set rpc timeout for this mutator instance</div>
+</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -343,7 +355,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
 <a name="getWriteBufferSize--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getWriteBufferSize</h4>
 <pre>long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutator.html#line.120">getWriteBufferSize</a>()</pre>
@@ -356,6 +368,26 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
 </dl>
 </li>
 </ul>
+<a name="setRpcTimeout-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setRpcTimeout</h4>
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutator.html#line.125">setRpcTimeout</a>(int&nbsp;timeout)</pre>
+<div class="block">Set rpc timeout for this mutator instance</div>
+</li>
+</ul>
+<a name="setOperationTimeout-int-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setOperationTimeout</h4>
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutator.html#line.130">setOperationTimeout</a>(int&nbsp;timeout)</pre>
+<div class="block">Set operation timeout for this mutator instance</div>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
 
b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
index 7ecf3ac..368253f 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.285">BufferedMutatorImpl.QueueRowAccess</a>
+<pre>private class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.301">BufferedMutatorImpl.QueueRowAccess</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/RowAccess.html" 
title="interface in org.apache.hadoop.hbase.client">RowAccess</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;</pre>
 </li>
@@ -231,7 +231,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>remainder</h4>
-<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.286">remainder</a></pre>
+<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.302">remainder</a></pre>
 </li>
 </ul>
 </li>
@@ -248,7 +248,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>QueueRowAccess</h4>
-<pre>private&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.285">QueueRowAccess</a>()</pre>
+<pre>private&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.301">QueueRowAccess</a>()</pre>
 </li>
 </ul>
 </li>
@@ -265,7 +265,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html
 <ul class="blockList">
 <li class="blockList">
 <h4>reset</h4>
-<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.288">reset</a>()</pre>
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.304">reset</a>()</pre>
 </li>
 </ul>
 <a name="iterator--">
@@ -274,7 +274,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html
 <ul class="blockList">
 <li class="blockList">
 <h4>iterator</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true";
 title="class or interface in java.util">Iterator</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.294">iterator</a>()</pre>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true";
 title="class or interface in java.util">Iterator</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.310">iterator</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true#iterator--";
 title="class or interface in java.lang">iterator</a></code>&nbsp;in 
interface&nbsp;<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true";
 title="class or interface in java.lang">Iterable</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;</code></dd>
@@ -287,7 +287,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html
 <ul class="blockList">
 <li class="blockList">
 <h4>size</h4>
-<pre>public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.331">size</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.347">size</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html#size--">size</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html" 
title="interface in org.apache.hadoop.hbase.client">RowAccess</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;</code></dd>
@@ -302,7 +302,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html
 <ul class="blockList">
 <li class="blockList">
 <h4>restoreRemainder</h4>
-<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.335">restoreRemainder</a>()</pre>
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.351">restoreRemainder</a>()</pre>
 </li>
 </ul>
 <a name="isEmpty--">
@@ -311,7 +311,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isEmpty</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.343">isEmpty</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html#line.359">isEmpty</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html#isEmpty--">isEmpty</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RowAccess.html" 
title="interface in org.apache.hadoop.hbase.client">RowAccess</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;</code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html 
b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html
index 0ea4a67..f0c65bd 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":42,"i9":10};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":42,"i11":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -213,28 +213,32 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#maxKeyValueSize">maxKeyValueSize</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#operationTimeout">operationTimeout</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true";
 title="class or interface in 
java.util.concurrent">ExecutorService</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#pool">pool</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#tableName">tableName</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>(package private) <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicInteger.html?is-external=true";
 title="class or interface in 
java.util.concurrent.atomic">AtomicInteger</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#undealtMutationCount">undealtMutationCount</a></span></code>
 <div class="block">Count the size of <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#writeAsyncBuffer"><code>writeAsyncBuffer</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>(package private) <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentLinkedQueue.html?is-external=true";
 title="class or interface in 
java.util.concurrent">ConcurrentLinkedQueue</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class 
in org.apache.hadoop.hbase.client">Mutation</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#writeAsyncBuffer">writeAsyncBuffer</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#writeBufferSize">writeBufferSize</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#writeRpcTimeout">writeRpcTimeout</a></span></code>&nbsp;</td>
 </tr>
@@ -324,13 +328,25 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#setOperationTimeout-int-">setOperationTimeout</a></span>(int&nbsp;timeout)</code>
+<div class="block">Set operation timeout for this mutator instance</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#setRpcTimeout-int-">setRpcTimeout</a></span>(int&nbsp;timeout)</code>
+<div class="block">Set rpc timeout for this mutator instance</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#setWriteBufferSize-long-">setWriteBufferSize</a></span>(long&nbsp;writeBufferSize)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">Going away when we drop 
public support for <a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html" title="class 
in org.apache.hadoop.hbase.client"><code>HTable</code></a>.</span></div>
 </div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#validatePut-org.apache.hadoop.hbase.client.Put-">validatePut</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&nbsp;put)</code>&nbsp;</td>
 </tr>
@@ -475,13 +491,22 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.84">writeRpcTimeout</a></pre>
 </li>
 </ul>
+<a name="operationTimeout">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>operationTimeout</h4>
+<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.85">operationTimeout</a></pre>
+</li>
+</ul>
 <a name="ap">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ap</h4>
-<pre>protected&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.html" 
title="class in org.apache.hadoop.hbase.client">AsyncProcess</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.87">ap</a></pre>
+<pre>protected&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.html" 
title="class in org.apache.hadoop.hbase.client">AsyncProcess</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.88">ap</a></pre>
 </li>
 </ul>
 </li>
@@ -498,7 +523,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockListLast">
 <li class="blockList">
 <h4>BufferedMutatorImpl</h4>
-<pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.89">BufferedMutatorImpl</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/ClusterConnection.html" 
title="interface in 
org.apache.hadoop.hbase.client">ClusterConnection</a>&nbsp;conn,
+<pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.90">BufferedMutatorImpl</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/ClusterConnection.html" 
title="interface in 
org.apache.hadoop.hbase.client">ClusterConnection</a>&nbsp;conn,
                     <a 
href="../../../../../org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.html"
 title="class in 
org.apache.hadoop.hbase.client">RpcRetryingCallerFactory</a>&nbsp;rpcCallerFactory,
                     <a 
href="../../../../../org/apache/hadoop/hbase/ipc/RpcControllerFactory.html" 
title="class in 
org.apache.hadoop.hbase.ipc">RpcControllerFactory</a>&nbsp;rpcFactory,
                     <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html" 
title="class in 
org.apache.hadoop.hbase.client">BufferedMutatorParams</a>&nbsp;params)</pre>
@@ -518,7 +543,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockList">
 <li class="blockList">
 <h4>getName</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.116">getName</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.120">getName</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#getName--">BufferedMutator</a></code></span></div>
 <div class="block">Gets the fully qualified table name instance of the table 
that this BufferedMutator writes to.</div>
 <dl>
@@ -533,7 +558,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockList">
 <li class="blockList">
 <h4>getConfiguration</h4>
-<pre>public&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.121">getConfiguration</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.conf.Configuration&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.125">getConfiguration</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#getConfiguration--">BufferedMutator</a></code></span></div>
 <div class="block">Returns the <code>Configuration</code> object used by this 
instance.
  <p>
@@ -551,7 +576,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockList">
 <li class="blockList">
 <h4>mutate</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.126">mutate</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" 
title="class in org.apache.hadoop.hbase.client">Mutation</a>&nbsp;m)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.130">mutate</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" 
title="class in org.apache.hadoop.hbase.client">Mutation</a>&nbsp;m)
             throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/InterruptedIOException.html?is-external=true";
 title="class or interface in java.io">InterruptedIOException</a>,
                    <a 
href="../../../../../org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html"
 title="class in 
org.apache.hadoop.hbase.client">RetriesExhaustedWithDetailsException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#mutate-org.apache.hadoop.hbase.client.Mutation-">BufferedMutator</a></code></span></div>
@@ -574,7 +599,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockList">
 <li class="blockList">
 <h4>mutate</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.132">mutate</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;? extends <a 
href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class 
in org.apache.hadoop.hbase.client">Mutation</a>&gt;&nbsp;ms)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.136">mutate</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;? extends <a 
href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class 
in org.apache.hadoop.hbase.client">Mutation</a>&gt;&nbsp;ms)
             throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/InterruptedIOException.html?is-external=true";
 title="class or interface in java.io">InterruptedIOException</a>,
                    <a 
href="../../../../../org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html"
 title="class in 
org.apache.hadoop.hbase.client">RetriesExhaustedWithDetailsException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#mutate-java.util.List-">BufferedMutator</a></code></span></div>
@@ -598,7 +623,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockList">
 <li class="blockList">
 <h4>validatePut</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.171">validatePut</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&nbsp;put)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.175">validatePut</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&nbsp;put)
                  throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true";
 title="class or interface in java.lang">IllegalArgumentException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -612,7 +637,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockList">
 <li class="blockList">
 <h4>close</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.176">close</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.180">close</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/BufferedMutator.html#close--">BufferedMutator</a></code></span></div>
 <div class="block">Performs a <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#flush--"><code>BufferedMutator.flush()</code></a>
 and releases any resources held.</div>
@@ -634,7 +659,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockList">
 <li class="blockList">
 <h4>flush</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.206">flush</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.210">flush</a>()
            throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/InterruptedIOException.html?is-external=true";
 title="class or interface in java.io">InterruptedIOException</a>,
                   <a 
href="../../../../../org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html"
 title="class in 
org.apache.hadoop.hbase.client">RetriesExhaustedWithDetailsException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#flush--">BufferedMutator</a></code></span></div>
@@ -655,7 +680,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <ul class="blockList">
 <li class="blockList">
 <h4>backgroundFlushCommits</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.221">backgroundFlushCommits</a>(boolean&nbsp;synchronous)
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.225">backgroundFlushCommits</a>(boolean&nbsp;synchronous)
                              throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/InterruptedIOException.html?is-external=true";
 title="class or interface in java.io">InterruptedIOException</a>,
                                     <a 
href="../../../../../org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html"
 title="class in 
org.apache.hadoop.hbase.client">RetriesExhaustedWithDetailsException</a></pre>
 <div class="block">Send the operations in the buffer to the servers. Does not 
wait for the server's answer. If
@@ -678,7 +703,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutato
 <li class="blockList">
 <h4>setWriteBufferSize</h4>
 <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&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.269">setWriteBufferSize</a>(long&nbsp;writeBufferSize)
+public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.273">setWriteBufferSize</a>(long&nbsp;writeBufferSize)
                                     throws <a 
href="../../../../../org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.html"
 title="class in 
org.apache.hadoop.hbase.client">RetriesExhaustedWithDetailsException</a>,
                                            <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/InterruptedIOException.html?is-external=true";
 title="class or interface in java.io">InterruptedIOException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span 
class="deprecationComment">Going away when we drop public support for <a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html" title="class 
in org.apache.hadoop.hbase.client"><code>HTable</code></a>.</span></div>
@@ -694,10 +719,10 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 <a name="getWriteBufferSize--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getWriteBufferSize</h4>
-<pre>public&nbsp;long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.281">getWriteBufferSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.285">getWriteBufferSize</a>()</pre>
 <div class="block">Returns the maximum size in bytes of the write buffer for 
this HTable.
  <p>
  The default value comes from the configuration parameter 
<code>hbase.client.write.buffer</code>.</div>
@@ -709,6 +734,36 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 </dl>
 </li>
 </ul>
+<a name="setRpcTimeout-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setRpcTimeout</h4>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.290">setRpcTimeout</a>(int&nbsp;timeout)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#setRpcTimeout-int-">BufferedMutator</a></code></span></div>
+<div class="block">Set rpc timeout for this mutator instance</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#setRpcTimeout-int-">setRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" 
title="interface in 
org.apache.hadoop.hbase.client">BufferedMutator</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="setOperationTimeout-int-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setOperationTimeout</h4>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#line.296">setOperationTimeout</a>(int&nbsp;timeout)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#setOperationTimeout-int-">BufferedMutator</a></code></span></div>
+<div class="block">Set operation timeout for this mutator instance</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#setOperationTimeout-int-">setOperationTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" 
title="interface in 
org.apache.hadoop.hbase.client">BufferedMutator</a></code></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/Cancellable.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/Cancellable.html 
b/devapidocs/org/apache/hadoop/hbase/client/Cancellable.html
index 5947448..9e86de9 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/Cancellable.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/Cancellable.html
@@ -101,7 +101,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">CancellableRegionServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/MultiServerCallable.html" 
title="class in org.apache.hadoop.hbase.client">MultiServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/NoncedRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">NoncedRegionServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.RetryingRPC.html"
 title="class in 
org.apache.hadoop.hbase.client">ScannerCallableWithReplicas.RetryingRPC</a></dd>
+<dd><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">CancellableRegionServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/MultiServerCallable.html" 
title="class in org.apache.hadoop.hbase.client">MultiServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.RetryingRPC.html"
 title="class in 
org.apache.hadoop.hbase.client">ScannerCallableWithReplicas.RetryingRPC</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html
 
b/devapidocs/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html
index 9547581..c262647 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html
@@ -123,17 +123,20 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a 
href="../../../../../org/apache/hadoop/hbase/client/MultiServerCallable.html" 
title="class in org.apache.hadoop.hbase.client">MultiServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/NoncedRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">NoncedRegionServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable</a></dd>
+<dd><a 
href="../../../../../org/apache/hadoop/hbase/client/MultiServerCallable.html" 
title="class in org.apache.hadoop.hbase.client">MultiServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable</a></dd>
 </dl>
 <hr>
 <br>
 <pre><a 
href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
-abstract class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.35">CancellableRegionServerCallable</a>&lt;T&gt;
+abstract class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.38">CancellableRegionServerCallable</a>&lt;T&gt;
 extends <a 
href="../../../../../org/apache/hadoop/hbase/client/ClientServiceCallable.html" 
title="class in 
org.apache.hadoop.hbase.client">ClientServiceCallable</a>&lt;T&gt;
 implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.html" 
title="interface in org.apache.hadoop.hbase.client">Cancellable</a></pre>
 <div class="block">This class is used to unify HTable calls with AsyncProcess 
Framework. HTable can use
  AsyncProcess directly though this class. Also adds global timeout tracking on 
top of
- RegionServerCallable and implements Cancellable.</div>
+ RegionServerCallable and implements Cancellable.
+ Global timeout tracking conflicts with logic in RpcRetryingCallerImpl's 
callWithRetries. So you
+ can only use this callable in AsyncProcess which only uses callWithoutRetries 
and retries in its
+ own implementation.</div>
 </li>
 </ul>
 </div>
@@ -153,6 +156,10 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#rpcTimeout">rpcTimeout</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/client/RetryingTimeTracker.html" 
title="class in 
org.apache.hadoop.hbase.client">RetryingTimeTracker</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#tracker">tracker</a></span></code>&nbsp;</td>
 </tr>
@@ -178,10 +185,12 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#CancellableRegionServerCallable-org.apache.hadoop.hbase.client.Connection-org.apache.hadoop.hbase.TableName-byte:A-org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController-">CancellableRegionServerCallable</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Connection.html" 
title="interface in 
org.apache.hadoop.hbase.client">Connection</a>&nbsp;connection,
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#CancellableRegionServerCallable-org.apache.hadoop.hbase.client.Connection-org.apache.hadoop.hbase.TableName-byte:A-org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController-int-org.apache.hadoop.hbase.client.RetryingTimeTracker-">CancellableRegionServerCallable</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Connection.html" 
title="interface in 
org.apache.hadoop.hbase.client">Connection</a>&nbsp;connection,
                                <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                byte[]&nbsp;row,
-                               
org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController&nbsp;rpcController)</code>&nbsp;</td>
+                               
org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController&nbsp;rpcController,
+                               int&nbsp;rpcTimeout,
+                               <a 
href="../../../../../org/apache/hadoop/hbase/client/RetryingTimeTracker.html" 
title="class in 
org.apache.hadoop.hbase.client">RetryingTimeTracker</a>&nbsp;tracker)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -200,7 +209,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html"
 title="type parameter in CancellableRegionServerCallable">T</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#call-int-">call</a></span>(int&nbsp;callTimeout)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#call-int-">call</a></span>(int&nbsp;operationTimeout)</code>
 <div class="block">Override that changes call Exception from <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang"><code>Exception</code></a> to <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io"><code>IOException</code></a>.</div>
 </td>
 </tr>
@@ -283,10 +292,19 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <a name="tracker">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>tracker</h4>
-<pre>private final&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/RetryingTimeTracker.html" 
title="class in org.apache.hadoop.hbase.client">RetryingTimeTracker</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.37">tracker</a></pre>
+<pre>private final&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/RetryingTimeTracker.html" 
title="class in org.apache.hadoop.hbase.client">RetryingTimeTracker</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.40">tracker</a></pre>
+</li>
+</ul>
+<a name="rpcTimeout">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>rpcTimeout</h4>
+<pre>private final&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.41">rpcTimeout</a></pre>
 </li>
 </ul>
 </li>
@@ -297,16 +315,18 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="CancellableRegionServerCallable-org.apache.hadoop.hbase.client.Connection-org.apache.hadoop.hbase.TableName-byte:A-org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController-">
+<a 
name="CancellableRegionServerCallable-org.apache.hadoop.hbase.client.Connection-org.apache.hadoop.hbase.TableName-byte:A-org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController-int-org.apache.hadoop.hbase.client.RetryingTimeTracker-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CancellableRegionServerCallable</h4>
-<pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.39">CancellableRegionServerCallable</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Connection.html" 
title="interface in 
org.apache.hadoop.hbase.client">Connection</a>&nbsp;connection,
+<pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.42">CancellableRegionServerCallable</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Connection.html" 
title="interface in 
org.apache.hadoop.hbase.client">Connection</a>&nbsp;connection,
                                 <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                 byte[]&nbsp;row,
-                                
org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController&nbsp;rpcController)</pre>
+                                
org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController&nbsp;rpcController,
+                                int&nbsp;rpcTimeout,
+                                <a 
href="../../../../../org/apache/hadoop/hbase/client/RetryingTimeTracker.html" 
title="class in 
org.apache.hadoop.hbase.client">RetryingTimeTracker</a>&nbsp;tracker)</pre>
 </li>
 </ul>
 </li>
@@ -323,7 +343,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>call</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html"
 title="type parameter in CancellableRegionServerCallable">T</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.49">call</a>(int&nbsp;callTimeout)
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html"
 title="type parameter in CancellableRegionServerCallable">T</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.54">call</a>(int&nbsp;operationTimeout)
        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 
class:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionServerCallable.html#call-int-">RegionServerCallable</a></code></span></div>
 <div class="block">Override that changes call Exception from <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang"><code>Exception</code></a> to <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io"><code>IOException</code></a>.
@@ -334,7 +354,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionServerCallable.html#call-int-">call</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionServerCallable.html" 
title="class in org.apache.hadoop.hbase.client">RegionServerCallable</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html"
 title="type parameter in 
CancellableRegionServerCallable">T</a>,org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService.BlockingInterface&gt;</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>callTimeout</code> - - the time available for this call. 0 for 
infinite.</dd>
+<dd><code>operationTimeout</code> - - the time available for this call. 0 for 
infinite.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>computed result</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -348,7 +368,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>prepare</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.65">prepare</a>(boolean&nbsp;reload)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.71">prepare</a>(boolean&nbsp;reload)
              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/RetryingCallable.html#prepare-boolean-">RetryingCallable</a></code></span></div>
 <div class="block">Prepare by setting up any connections to servers, etc., 
ahead of call invocation.
@@ -371,7 +391,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>setStubByServiceName</h4>
-<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.74">setStubByServiceName</a>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serviceName)
+<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.80">setStubByServiceName</a>(<a
 href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;serviceName)
                              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 
class:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionServerCallable.html#setStubByServiceName-org.apache.hadoop.hbase.ServerName-">RegionServerCallable</a></code></span></div>
 <div class="block">Set the RCP client stub</div>
@@ -391,7 +411,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>cancel</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.79">cancel</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.85">cancel</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.html#cancel--">cancel</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.html" 
title="interface in org.apache.hadoop.hbase.client">Cancellable</a></code></dd>
@@ -404,7 +424,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>isCancelled</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.84">isCancelled</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.90">isCancelled</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.html#isCancelled--">isCancelled</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.html" 
title="interface in org.apache.hadoop.hbase.client">Cancellable</a></code></dd>
@@ -417,7 +437,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>doMulti</h4>
-<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.88">doMulti</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiRequest&nbsp;request)
+<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.94">doMulti</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiRequest&nbsp;request)
                                                                                
         throws 
org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -431,7 +451,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>doScan</h4>
-<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.93">doScan</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest&nbsp;request)
+<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.99">doScan</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest&nbsp;request)
                                                                                
       throws 
org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -445,7 +465,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>doPrepareBulkLoad</h4>
-<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.98">doPrepareBulkLoad</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadRequest&nbsp;request)
+<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.104">doPrepareBulkLoad</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.PrepareBulkLoadRequest&nbsp;request)
                                                                                
                             throws 
org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -459,7 +479,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>doBulkLoadHFile</h4>
-<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.104">doBulkLoadHFile</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest&nbsp;request)
+<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.110">doBulkLoadHFile</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest&nbsp;request)
                                                                                
                         throws 
org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -473,7 +493,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Cancellable.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>doCleanupBulkLoad</h4>
-<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.110">doCleanupBulkLoad</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadRequest&nbsp;request)
+<pre>protected&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadResponse&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html#line.116">doCleanupBulkLoad</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.CleanupBulkLoadRequest&nbsp;request)
                                                                                
                             throws 
org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/ClientServiceCallable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/ClientServiceCallable.html 
b/devapidocs/org/apache/hadoop/hbase/client/ClientServiceCallable.html
index 5fd2dc3..9cc6ab4 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/ClientServiceCallable.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/ClientServiceCallable.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">CancellableRegionServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.html" 
title="class in org.apache.hadoop.hbase.client">ScannerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.ReplayServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.wal">WALEditsReplaySink.ReplayServerCallable</a></dd>
+<dd><a 
href="../../../../../org/apache/hadoop/hbase/client/CancellableRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">CancellableRegionServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/NoncedRegionServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.client">NoncedRegionServerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.html" 
title="class in org.apache.hadoop.hbase.client">ScannerCallable</a>, <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.ReplayServerCallable.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.wal">WALEditsReplaySink.ReplayServerCallable</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/ClusterConnection.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/ClusterConnection.html 
b/devapidocs/org/apache/hadoop/hbase/client/ClusterConnection.html
index 9a0844c..eca5217 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/ClusterConnection.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/ClusterConnection.html
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClientSmallScanner.SmallScannerCallableFactory.html"
 title="class in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterStatusListener.html" 
title="class in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterRegistry.html" 
title="interface in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a 
href="../../../../../index.html?org/apache/hadoop/hbase/client/ClusterConnection.html"
 target="_top">Frames</a></li>
@@ -1093,7 +1093,7 @@ boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/Clu
 <div class="subNav">
 <ul class="navList">
 <li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClientSmallScanner.SmallScannerCallableFactory.html"
 title="class in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterStatusListener.html" 
title="class in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterRegistry.html" 
title="interface in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a 
href="../../../../../index.html?org/apache/hadoop/hbase/client/ClusterConnection.html"
 target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/ClusterRegistry.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/ClusterRegistry.html 
b/devapidocs/org/apache/hadoop/hbase/client/ClusterRegistry.html
new file mode 100644
index 0000000..2a20b9f
--- /dev/null
+++ b/devapidocs/org/apache/hadoop/hbase/client/ClusterRegistry.html
@@ -0,0 +1,259 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ClusterRegistry (Apache HBase 2.0.0-SNAPSHOT API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" 
title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ClusterRegistry (Apache HBase 
2.0.0-SNAPSHOT API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ClusterRegistry.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterConnection.html" 
title="interface in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterRegistryFactory.html"
 title="class in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/apache/hadoop/hbase/client/ClusterRegistry.html"
 target="_top">Frames</a></li>
+<li><a href="ClusterRegistry.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.hadoop.hbase.client</div>
+<h2 title="Interface ClusterRegistry" class="title">Interface 
ClusterRegistry</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/AutoCloseable.html?is-external=true";
 title="class or interface in java.lang">AutoCloseable</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a></dd>
+</dl>
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a 
href="../../../../../org/apache/hadoop/hbase/client/ZKClusterRegistry.html" 
title="class in org.apache.hadoop.hbase.client">ZKClusterRegistry</a></dd>
+</dl>
+<hr>
+<br>
+<pre><a 
href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
+interface <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/ClusterRegistry.html#line.30">ClusterRegistry</a>
+extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a></pre>
+<div class="block">Implementations hold cluster information such as this 
cluster's id.
+ <p>
+ Internal use only.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span 
class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a 
href="javascript:show(2);">Instance Methods</a></span><span 
class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a 
href="javascript:show(4);">Abstract Methods</a></span><span 
class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterRegistry.html#close--">close</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><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/ClusterRegistry.html#getClusterId--">getClusterId</a></span>()</code>
+<div class="block">Should only be called once.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getClusterId--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getClusterId</h4>
+<pre><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;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/ClusterRegistry.html#line.37">getClusterId</a>()</pre>
+<div class="block">Should only be called once.
+ <p>
+ The upper layer should store this value somewhere as it will not be change 
any more.</div>
+</li>
+</ul>
+<a name="close--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>close</h4>
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/ClusterRegistry.html#line.40">close</a>()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/AutoCloseable.html?is-external=true#close--";
 title="class or interface in java.lang">close</a></code>&nbsp;in 
interface&nbsp;<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/AutoCloseable.html?is-external=true";
 title="class or interface in java.lang">AutoCloseable</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true#close--";
 title="class or interface in java.io">close</a></code>&nbsp;in 
interface&nbsp;<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ClusterRegistry.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterConnection.html" 
title="interface in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterRegistryFactory.html"
 title="class in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../index.html?org/apache/hadoop/hbase/client/ClusterRegistry.html"
 target="_top">Frames</a></li>
+<li><a href="ClusterRegistry.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
+</body>
+</html>

Reply via email to