http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/devapidocs/org/apache/hadoop/hbase/client/HTable.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/HTable.html 
b/devapidocs/org/apache/hadoop/hbase/client/HTable.html
index 26e7b5a..b21044b 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/HTable.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/HTable.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":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":9,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":9,"i33":10,"i34":10,"i35":10,"i36":9,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":42,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":42,"i57":42,"i58":42,"i59":42,"i60":10,"i61":10,"i62":9};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":9,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":9,"i33":10,"i34":10,"i35":10,"i36":9,"i37":10,"i38":42,"i39":10,"i40":10,"i41":42,"i42":10,"i43":10,"i44":42,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":42,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":42,"i61":42,"i62":42,"i63":42,"i64":10,"i65":10,"i66":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete 
Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -199,7 +199,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#operationTimeout">operationTimeout</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#operationTimeoutMs">operationTimeoutMs</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <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>
@@ -207,7 +207,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#readRpcTimeout">readRpcTimeout</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#readRpcTimeoutMs">readRpcTimeoutMs</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.html"
 title="class in 
org.apache.hadoop.hbase.client">RpcRetryingCallerFactory</a></code></td>
@@ -219,7 +219,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 </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/HTable.html#rpcTimeout">rpcTimeout</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#rpcTimeoutMs">rpcTimeoutMs</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private int</code></td>
@@ -235,7 +235,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 </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/HTable.html#writeRpcTimeout">writeRpcTimeout</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#writeRpcTimeoutMs">writeRpcTimeoutMs</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -597,74 +597,98 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 <tr id="i38" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getOperationTimeout--">getOperationTimeout</a></span>()</code>
-<div class="block">Get timeout (millisecond) of each operation for in Table 
instance.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
 <tr id="i39" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getOperationTimeout-java.util.concurrent.TimeUnit-">getOperationTimeout</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;unit)</code>
+<div class="block">Get timeout of each operation in Table instance.</div>
+</td>
+</tr>
+<tr id="i40" class="altColor">
 <td class="colFirst"><code>(package 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/HTable.html#getPool--">getPool</a></span>()</code>
 <div class="block">The pool is used for mutli requests for this HTable</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getReadRpcTimeout--">getReadRpcTimeout</a></span>()</code>
-<div class="block">Get timeout (millisecond) of each rpc read request in this 
Table instance.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i42" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getReadRpcTimeout-java.util.concurrent.TimeUnit-">getReadRpcTimeout</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;unit)</code>
+<div class="block">Get timeout of each rpc read request in this Table 
instance.</div>
+</td>
+</tr>
+<tr id="i43" class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/client/RegionLocator.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionLocator</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getRegionLocator--">getRegionLocator</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i44" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getRpcTimeout--">getRpcTimeout</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i45" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getRpcTimeout-java.util.concurrent.TimeUnit-">getRpcTimeout</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;unit)</code>
+<div class="block">Get timeout of each rpc request in this Table 
instance.</div>
+</td>
+</tr>
+<tr id="i46" class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" 
title="interface in 
org.apache.hadoop.hbase.client">ResultScanner</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getScanner-byte:A-">getScanner</a></span>(byte[]&nbsp;family)</code>
 <div class="block">The underlying <a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html" title="class 
in org.apache.hadoop.hbase.client"><code>HTable</code></a> must not be 
closed.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i47" class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" 
title="interface in 
org.apache.hadoop.hbase.client">ResultScanner</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getScanner-byte:A-byte:A-">getScanner</a></span>(byte[]&nbsp;family,
           byte[]&nbsp;qualifier)</code>
 <div class="block">The underlying <a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html" title="class 
in org.apache.hadoop.hbase.client"><code>HTable</code></a> must not be 
closed.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i48" class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" 
title="interface in 
org.apache.hadoop.hbase.client">ResultScanner</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getScanner-org.apache.hadoop.hbase.client.Scan-">getScanner</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in 
org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan)</code>
 <div class="block">The underlying <a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html" title="class 
in org.apache.hadoop.hbase.client"><code>HTable</code></a> must not be 
closed.</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr id="i49" class="rowColor">
 <td class="colFirst"><code>private <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;byte[]&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getStartKeysInRange-byte:A-byte:A-">getStartKeysInRange</a></span>(byte[]&nbsp;start,
                    byte[]&nbsp;end)</code>&nbsp;</td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr id="i50" class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/HTableDescriptor.html" 
title="class in org.apache.hadoop.hbase">HTableDescriptor</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getTableDescriptor--">getTableDescriptor</a></span>()</code>
 <div class="block">Gets the <a 
href="../../../../../org/apache/hadoop/hbase/HTableDescriptor.html" 
title="class in org.apache.hadoop.hbase"><code>table descriptor</code></a> for 
this table.</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i51" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getWriteRpcTimeout--">getWriteRpcTimeout</a></span>()</code>
-<div class="block">Get timeout (millisecond) of each rpc write request in this 
Table instance.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i52" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#getWriteRpcTimeout-java.util.concurrent.TimeUnit-">getWriteRpcTimeout</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;unit)</code>
+<div class="block">Get timeout of each rpc write request in this Table 
instance.</div>
+</td>
+</tr>
+<tr id="i53" class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class 
in org.apache.hadoop.hbase.client">Result</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#increment-org.apache.hadoop.hbase.client.Increment-">increment</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Increment.html" 
title="class in 
org.apache.hadoop.hbase.client">Increment</a>&nbsp;increment)</code>
 <div class="block">Increments one or more columns within a single row.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i54" class="altColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#incrementColumnValue-byte:A-byte:A-byte:A-long-">incrementColumnValue</a></span>(byte[]&nbsp;row,
                     byte[]&nbsp;family,
@@ -673,7 +697,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 <div class="block">See <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#incrementColumnValue-byte:A-byte:A-byte:A-long-org.apache.hadoop.hbase.client.Durability-"><code>Table.incrementColumnValue(byte[],
 byte[], byte[], long, Durability)</code></a></div>
 </td>
 </tr>
-<tr id="i51" class="rowColor">
+<tr id="i55" class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#incrementColumnValue-byte:A-byte:A-byte:A-long-org.apache.hadoop.hbase.client.Durability-">incrementColumnValue</a></span>(byte[]&nbsp;row,
                     byte[]&nbsp;family,
@@ -683,13 +707,13 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 <div class="block">Atomically increments a column value.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr id="i56" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#mutateRow-org.apache.hadoop.hbase.client.RowMutations-">mutateRow</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/RowMutations.html" 
title="class in org.apache.hadoop.hbase.client">RowMutations</a>&nbsp;rm)</code>
 <div class="block">Performs multiple mutations atomically on a single 
row.</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr id="i57" class="rowColor">
 <td class="colFirst"><code>&lt;R&gt;&nbsp;void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#processBatchCallback-java.util.List-java.lang.Object:A-org.apache.hadoop.hbase.client.coprocessor.Batch.Callback-">processBatchCallback</a></span>(<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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;list,
                     <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>[]&nbsp;results,
@@ -697,51 +721,51 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 <div class="block">Process a mixed batch of Get, Put and Delete actions.</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr id="i58" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#put-java.util.List-">put</a></span>(<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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&gt;&nbsp;puts)</code>
 <div class="block">Batch puts the specified data into the table.</div>
 </td>
 </tr>
-<tr id="i55" class="rowColor">
+<tr id="i59" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#put-org.apache.hadoop.hbase.client.Put-">put</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&nbsp;put)</code>
 <div class="block">Puts some data in the table.</div>
 </td>
 </tr>
-<tr id="i56" class="altColor">
+<tr id="i60" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#setOperationTimeout-int-">setOperationTimeout</a></span>(int&nbsp;operationTimeout)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
-<tr id="i57" class="rowColor">
+<tr id="i61" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#setReadRpcTimeout-int-">setReadRpcTimeout</a></span>(int&nbsp;readRpcTimeout)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
-<tr id="i58" class="altColor">
+<tr id="i62" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#setRpcTimeout-int-">setRpcTimeout</a></span>(int&nbsp;rpcTimeout)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
-<tr id="i59" class="rowColor">
+<tr id="i63" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#setWriteRpcTimeout-int-">setWriteRpcTimeout</a></span>(int&nbsp;writeRpcTimeout)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
-<tr id="i60" class="altColor">
+<tr id="i64" class="altColor">
 <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/HTable.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i61" class="rowColor">
+<tr id="i65" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.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>
-<tr id="i62" class="altColor">
+<tr id="i66" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/client/HTable.html#validatePut-org.apache.hadoop.hbase.client.Put-int-">validatePut</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&nbsp;put,
            int&nbsp;maxKeyValueSize)</code>&nbsp;</td>
@@ -858,40 +882,40 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 <pre>private final&nbsp;<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> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.114">pool</a></pre>
 </li>
 </ul>
-<a name="operationTimeout">
+<a name="operationTimeoutMs">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>operationTimeout</h4>
-<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.115">operationTimeout</a></pre>
+<h4>operationTimeoutMs</h4>
+<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.115">operationTimeoutMs</a></pre>
 </li>
 </ul>
-<a name="rpcTimeout">
+<a name="rpcTimeoutMs">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>rpcTimeout</h4>
-<pre>private final&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.116">rpcTimeout</a></pre>
+<h4>rpcTimeoutMs</h4>
+<pre>private final&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.116">rpcTimeoutMs</a></pre>
 </li>
 </ul>
-<a name="readRpcTimeout">
+<a name="readRpcTimeoutMs">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>readRpcTimeout</h4>
-<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.117">readRpcTimeout</a></pre>
+<h4>readRpcTimeoutMs</h4>
+<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.117">readRpcTimeoutMs</a></pre>
 </li>
 </ul>
-<a name="writeRpcTimeout">
+<a name="writeRpcTimeoutMs">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>writeRpcTimeout</h4>
-<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.118">writeRpcTimeout</a></pre>
+<h4>writeRpcTimeoutMs</h4>
+<pre>private&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.118">writeRpcTimeoutMs</a></pre>
 </li>
 </ul>
 <a name="cleanupPoolOnClose">
@@ -1252,7 +1276,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>get</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/HTable.html#line.412">get</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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Get.html" title="class in 
org.apache.hadoop.hbase.client">Get</a>&gt;&nbsp;gets)
+<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/HTable.html#line.411">get</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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Get.html" title="class in 
org.apache.hadoop.hbase.client">Get</a>&gt;&nbsp;gets)
              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">Extracts specified cells from the given rows, as a 
batch.</div>
 <dl>
@@ -1277,7 +1301,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>batch</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.436">batch</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;actions,
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.435">batch</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;actions,
                   <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>[]&nbsp;results)
            throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true";
 title="class or interface in java.lang">InterruptedException</a>,
                   <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>
@@ -1306,7 +1330,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>batch</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.457">batch</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;actions,
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.456">batch</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;actions,
                   <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>[]&nbsp;results,
                   int&nbsp;rpcTimeout)
            throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true";
 title="class or interface in java.lang">InterruptedException</a>,
@@ -1324,7 +1348,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>batchCallback</h4>
-<pre>public&nbsp;&lt;R&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.479">batchCallback</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;actions,
+<pre>public&nbsp;&lt;R&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.478">batchCallback</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;actions,
                               <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>[]&nbsp;results,
                               <a 
href="../../../../../org/apache/hadoop/hbase/client/coprocessor/Batch.Callback.html"
 title="interface in 
org.apache.hadoop.hbase.client.coprocessor">Batch.Callback</a>&lt;R&gt;&nbsp;callback)
                        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>,
@@ -1345,7 +1369,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>doBatchWithCallback</h4>
-<pre>public static&nbsp;&lt;R&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.485">doBatchWithCallback</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;actions,
+<pre>public static&nbsp;&lt;R&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.484">doBatchWithCallback</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;actions,
                                            <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>[]&nbsp;results,
                                            <a 
href="../../../../../org/apache/hadoop/hbase/client/coprocessor/Batch.Callback.html"
 title="interface in 
org.apache.hadoop.hbase.client.coprocessor">Batch.Callback</a>&lt;R&gt;&nbsp;callback,
                                            <a 
href="../../../../../org/apache/hadoop/hbase/client/ClusterConnection.html" 
title="interface in 
org.apache.hadoop.hbase.client">ClusterConnection</a>&nbsp;connection,
@@ -1366,7 +1390,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>delete</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.512">delete</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Delete.html" title="class 
in org.apache.hadoop.hbase.client">Delete</a>&nbsp;delete)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.511">delete</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Delete.html" title="class 
in org.apache.hadoop.hbase.client">Delete</a>&nbsp;delete)
             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">Deletes the specified cells/row.</div>
 <dl>
@@ -1385,7 +1409,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>delete</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.547">delete</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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Delete.html" title="class 
in org.apache.hadoop.hbase.client">Delete</a>&gt;&nbsp;deletes)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.546">delete</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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Delete.html" title="class 
in org.apache.hadoop.hbase.client">Delete</a>&gt;&nbsp;deletes)
             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">Batch Deletes the specified cells/rows from the table.
  <p>
@@ -1415,7 +1439,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>put</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.573">put</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/HTable.html#line.572">put</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/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Puts some data in the table.</div>
 <dl>
@@ -1434,7 +1458,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>put</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.596">put</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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&gt;&nbsp;puts)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.595">put</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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&gt;&nbsp;puts)
          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">Batch puts the specified data into the table.
  <p>
@@ -1462,7 +1486,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>mutateRow</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.612">mutateRow</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/RowMutations.html" 
title="class in org.apache.hadoop.hbase.client">RowMutations</a>&nbsp;rm)
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.611">mutateRow</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/RowMutations.html" 
title="class in org.apache.hadoop.hbase.client">RowMutations</a>&nbsp;rm)
                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">Performs multiple mutations atomically on a single row. 
Currently
  <a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class 
in org.apache.hadoop.hbase.client"><code>Put</code></a> and <a 
href="../../../../../org/apache/hadoop/hbase/client/Delete.html" title="class 
in org.apache.hadoop.hbase.client"><code>Delete</code></a> are supported.</div>
@@ -1871,7 +1895,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>checkAndMutate</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.921">checkAndMutate</a>(byte[]&nbsp;row,
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.922">checkAndMutate</a>(byte[]&nbsp;row,
                               byte[]&nbsp;family,
                               byte[]&nbsp;qualifier,
                               <a 
href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html"
 title="enum in 
org.apache.hadoop.hbase.filter">CompareFilter.CompareOp</a>&nbsp;compareOp,
@@ -1909,7 +1933,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>checkAndMutate</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.931">checkAndMutate</a>(byte[]&nbsp;row,
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.932">checkAndMutate</a>(byte[]&nbsp;row,
                               byte[]&nbsp;family,
                               byte[]&nbsp;qualifier,
                               <a 
href="../../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum 
in org.apache.hadoop.hbase">CompareOperator</a>&nbsp;op,
@@ -1947,7 +1971,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>exists</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.941">exists</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Get.html" title="class in 
org.apache.hadoop.hbase.client">Get</a>&nbsp;get)
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.942">exists</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Get.html" title="class in 
org.apache.hadoop.hbase.client">Get</a>&nbsp;get)
                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">Test for the existence of columns in the table, as 
specified by the Get.
  <p>
@@ -1975,7 +1999,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>existsAll</h4>
-<pre>public&nbsp;boolean[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.951">existsAll</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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Get.html" title="class in 
org.apache.hadoop.hbase.client">Get</a>&gt;&nbsp;gets)
+<pre>public&nbsp;boolean[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.952">existsAll</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;<a 
href="../../../../../org/apache/hadoop/hbase/client/Get.html" title="class in 
org.apache.hadoop.hbase.client">Get</a>&gt;&nbsp;gets)
                     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">Test for the existence of columns in the table, as 
specified by the Gets.
  <p>
@@ -2004,7 +2028,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>processBatchCallback</h4>
-<pre>public&nbsp;&lt;R&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.991">processBatchCallback</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;list,
+<pre>public&nbsp;&lt;R&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.992">processBatchCallback</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/Row.html" title="interface 
in org.apache.hadoop.hbase.client">Row</a>&gt;&nbsp;list,
                                      <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>[]&nbsp;results,
                                      <a 
href="../../../../../org/apache/hadoop/hbase/client/coprocessor/Batch.Callback.html"
 title="interface in 
org.apache.hadoop.hbase.client.coprocessor">Batch.Callback</a>&lt;R&gt;&nbsp;callback)
                               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>,
@@ -2030,7 +2054,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>close</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.998">close</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.999">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/Table.html#close--">Table</a></code></span></div>
 <div class="block">Releases any resources held or pending changes in internal 
buffers.</div>
@@ -2052,7 +2076,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>validatePut</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1019">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/HTable.html#line.1020">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>
@@ -2066,7 +2090,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>validatePut</h4>
-<pre>public static&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1024">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 static&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1025">validatePut</a>(<a
 href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in 
org.apache.hadoop.hbase.client">Put</a>&nbsp;put,
                                int&nbsp;maxKeyValueSize)
                         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>
@@ -2081,7 +2105,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>getPool</h4>
-<pre><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>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1043">getPool</a>()</pre>
+<pre><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>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1044">getPool</a>()</pre>
 <div class="block">The pool is used for mutli requests for this HTable</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -2095,7 +2119,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>clearRegionCache</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1051">clearRegionCache</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1052">clearRegionCache</a>()</pre>
 <div class="block">Explicitly clears the region cache to fetch the latest 
value from META.
  This is a power user function: avoid unless you know the ramifications.</div>
 </li>
@@ -2106,7 +2130,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>coprocessorService</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html" 
title="interface in 
org.apache.hadoop.hbase.ipc">CoprocessorRpcChannel</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1059">coprocessorService</a>(byte[]&nbsp;row)</pre>
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.html" 
title="interface in 
org.apache.hadoop.hbase.ipc">CoprocessorRpcChannel</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1060">coprocessorService</a>(byte[]&nbsp;row)</pre>
 <div class="block">Creates and returns a <code>RpcChannel</code> instance 
connected to the
  table region containing the specified row.  The row given does not actually 
have
  to exist.  Whichever region would contain the row based on start and end keys 
will
@@ -2145,7 +2169,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>coprocessorService</h4>
-<pre>public&nbsp;&lt;T extends com.google.protobuf.Service,R&gt;&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;byte[],R&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1067">coprocessorService</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;service,
+<pre>public&nbsp;&lt;T extends com.google.protobuf.Service,R&gt;&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;byte[],R&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1068">coprocessorService</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;service,
                                                                                
   byte[]&nbsp;startKey,
                                                                                
   byte[]&nbsp;endKey,
                                                                                
   <a 
href="../../../../../org/apache/hadoop/hbase/client/coprocessor/Batch.Call.html"
 title="interface in 
org.apache.hadoop.hbase.client.coprocessor">Batch.Call</a>&lt;T,R&gt;&nbsp;callable)
@@ -2183,7 +2207,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>coprocessorService</h4>
-<pre>public&nbsp;&lt;T extends 
com.google.protobuf.Service,R&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1087">coprocessorService</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;service,
+<pre>public&nbsp;&lt;T extends 
com.google.protobuf.Service,R&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1088">coprocessorService</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;service,
                                                                          
byte[]&nbsp;startKey,
                                                                          
byte[]&nbsp;endKey,
                                                                          <a 
href="../../../../../org/apache/hadoop/hbase/client/coprocessor/Batch.Call.html"
 title="interface in 
org.apache.hadoop.hbase.client.coprocessor">Batch.Call</a>&lt;T,R&gt;&nbsp;callable,
@@ -2223,7 +2247,7 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 <ul class="blockList">
 <li class="blockList">
 <h4>getStartKeysInRange</h4>
-<pre>private&nbsp;<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;byte[]&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1125">getStartKeysInRange</a>(byte[]&nbsp;start,
+<pre>private&nbsp;<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;byte[]&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1126">getStartKeysInRange</a>(byte[]&nbsp;start,
                                          byte[]&nbsp;end)
                                   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>
 <dl>
@@ -2232,43 +2256,26 @@ public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/c
 </dl>
 </li>
 </ul>
-<a name="setOperationTimeout-int-">
+<a name="getRpcTimeout-java.util.concurrent.TimeUnit-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setOperationTimeout</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/HTable.html#line.1138">setOperationTimeout</a>(int&nbsp;operationTimeout)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setOperationTimeout-int-">Table</a></code></span></div>
-<div class="block">Set timeout (millisecond) of each operation in this Table 
instance, will override the value
- of hbase.client.operation.timeout in configuration.
- Operation timeout is a top-level restriction that makes sure a blocking 
method will not be
- blocked more than this. In each operation, if rpc request fails because of 
timeout or
- other reason, it will retry until success or throw a 
RetriesExhaustedException. But if the
- total time being blocking reach the operation timeout before retries 
exhausted, it will break
- early and throw SocketTimeoutException.</div>
+<h4>getRpcTimeout</h4>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1138">getRpcTimeout</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;unit)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getRpcTimeout-java.util.concurrent.TimeUnit-">Table</a></code></span></div>
+<div class="block">Get timeout of each rpc request in this Table instance. It 
will be overridden by a more
+ specific rpc timeout config such as readRpcTimeout or writeRpcTimeout.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setOperationTimeout-int-">setOperationTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getRpcTimeout-java.util.concurrent.TimeUnit-">getRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>operationTimeout</code> - the total timeout of each operation in 
millisecond.</dd>
-</dl>
-</li>
-</ul>
-<a name="getOperationTimeout--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getOperationTimeout</h4>
-<pre>public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1143">getOperationTimeout</a>()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getOperationTimeout--">Table</a></code></span></div>
-<div class="block">Get timeout (millisecond) of each operation for in Table 
instance.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getOperationTimeout--">getOperationTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>rpc timeout in the specified time unit</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout-java.util.concurrent.TimeUnit-"><code>Table.getReadRpcTimeout(TimeUnit)</code></a>,
 
+<a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteRpcTimeout-java.util.concurrent.TimeUnit-"><code>Table.getWriteRpcTimeout(TimeUnit)</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -2279,7 +2286,7 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 <li class="blockList">
 <h4>getRpcTimeout</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;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1149">getRpcTimeout</a>()</pre>
+public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1144">getRpcTimeout</a>()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getRpcTimeout--">Table</a></code></span></div>
 <div class="block">Get timeout (millisecond) of each rpc request in this Table 
instance.</div>
@@ -2298,7 +2305,7 @@ public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/cl
 <li class="blockList">
 <h4>setRpcTimeout</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/HTable.html#line.1155">setRpcTimeout</a>(int&nbsp;rpcTimeout)</pre>
+public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1150">setRpcTimeout</a>(int&nbsp;rpcTimeout)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setRpcTimeout-int-">Table</a></code></span></div>
 <div class="block">Set timeout (millisecond) of each rpc request in operations 
of this Table instance, will
@@ -2315,13 +2322,92 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 </dl>
 </li>
 </ul>
+<a name="getReadRpcTimeout-java.util.concurrent.TimeUnit-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getReadRpcTimeout</h4>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1156">getReadRpcTimeout</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;unit)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout-java.util.concurrent.TimeUnit-">Table</a></code></span></div>
+<div class="block">Get timeout of each rpc read request in this Table 
instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout-java.util.concurrent.TimeUnit-">getReadRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>read rpc timeout in the specified time unit</dd>
+</dl>
+</li>
+</ul>
+<a name="getReadRpcTimeout--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getReadRpcTimeout</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;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1162">getReadRpcTimeout</a>()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout--">Table</a></code></span></div>
+<div class="block">Get timeout (millisecond) of each rpc read request in this 
Table instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout--">getReadRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="setReadRpcTimeout-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setReadRpcTimeout</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/HTable.html#line.1168">setReadRpcTimeout</a>(int&nbsp;readRpcTimeout)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setReadRpcTimeout-int-">Table</a></code></span></div>
+<div class="block">Set timeout (millisecond) of each rpc read request in 
operations of this Table instance, will
+ override the value of hbase.rpc.read.timeout in configuration.
+ If a rpc read request waiting too long, it will stop waiting and send a new 
request to retry
+ until retries exhausted or operation timeout reached.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setReadRpcTimeout-int-">setReadRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>readRpcTimeout</code> - the timeout for read rpc request in 
milliseconds</dd>
+</dl>
+</li>
+</ul>
+<a name="getWriteRpcTimeout-java.util.concurrent.TimeUnit-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getWriteRpcTimeout</h4>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1173">getWriteRpcTimeout</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;unit)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteRpcTimeout-java.util.concurrent.TimeUnit-">Table</a></code></span></div>
+<div class="block">Get timeout of each rpc write request in this Table 
instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteRpcTimeout-java.util.concurrent.TimeUnit-">getWriteRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>write rpc timeout in the specified time unit</dd>
+</dl>
+</li>
+</ul>
 <a name="getWriteRpcTimeout--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriteRpcTimeout</h4>
-<pre>public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1161">getWriteRpcTimeout</a>()</pre>
+<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;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1179">getWriteRpcTimeout</a>()</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteRpcTimeout--">Table</a></code></span></div>
 <div class="block">Get timeout (millisecond) of each rpc write request in this 
Table instance.</div>
 <dl>
@@ -2337,7 +2423,7 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 <li class="blockList">
 <h4>setWriteRpcTimeout</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/HTable.html#line.1167">setWriteRpcTimeout</a>(int&nbsp;writeRpcTimeout)</pre>
+public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1185">setWriteRpcTimeout</a>(int&nbsp;writeRpcTimeout)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setWriteRpcTimeout-int-">Table</a></code></span></div>
 <div class="block">Set timeout (millisecond) of each rpc write request in 
operations of this Table instance, will
@@ -2347,41 +2433,69 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setWriteRpcTimeout-int-">setWriteRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>writeRpcTimeout</code> - the timeout for write rpc request in 
milliseconds</dd>
 </dl>
 </li>
 </ul>
-<a name="getReadRpcTimeout--">
+<a name="getOperationTimeout-java.util.concurrent.TimeUnit-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getReadRpcTimeout</h4>
-<pre>public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1172">getReadRpcTimeout</a>()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout--">Table</a></code></span></div>
-<div class="block">Get timeout (millisecond) of each rpc read request in this 
Table instance.</div>
+<h4>getOperationTimeout</h4>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1190">getOperationTimeout</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;unit)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getOperationTimeout-java.util.concurrent.TimeUnit-">Table</a></code></span></div>
+<div class="block">Get timeout of each operation in Table instance.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout--">getReadRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getOperationTimeout-java.util.concurrent.TimeUnit-">getOperationTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>operation rpc timeout in the specified time unit</dd>
 </dl>
 </li>
 </ul>
-<a name="setReadRpcTimeout-int-">
+<a name="getOperationTimeout--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setReadRpcTimeout</h4>
+<h4>getOperationTimeout</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/HTable.html#line.1176">setReadRpcTimeout</a>(int&nbsp;readRpcTimeout)</pre>
+public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1196">getOperationTimeout</a>()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setReadRpcTimeout-int-">Table</a></code></span></div>
-<div class="block">Set timeout (millisecond) of each rpc read request in 
operations of this Table instance, will
- override the value of hbase.rpc.read.timeout in configuration.
- If a rpc read request waiting too long, it will stop waiting and send a new 
request to retry
- until retries exhausted or operation timeout reached.</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getOperationTimeout--">Table</a></code></span></div>
+<div class="block">Get timeout (millisecond) of each operation for in Table 
instance.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setReadRpcTimeout-int-">setReadRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#getOperationTimeout--">getOperationTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="setOperationTimeout-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setOperationTimeout</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/HTable.html#line.1202">setOperationTimeout</a>(int&nbsp;operationTimeout)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setOperationTimeout-int-">Table</a></code></span></div>
+<div class="block">Set timeout (millisecond) of each operation in this Table 
instance, will override the value
+ of hbase.client.operation.timeout in configuration.
+ Operation timeout is a top-level restriction that makes sure a blocking 
method will not be
+ blocked more than this. In each operation, if rpc request fails because of 
timeout or
+ other reason, it will retry until success or throw a 
RetriesExhaustedException. But if the
+ total time being blocking reach the operation timeout before retries 
exhausted, it will break
+ early and throw SocketTimeoutException.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html#setOperationTimeout-int-">setOperationTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Table.html" 
title="interface in org.apache.hadoop.hbase.client">Table</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>operationTimeout</code> - the total timeout of each operation in 
millisecond.</dd>
 </dl>
 </li>
 </ul>
@@ -2391,7 +2505,7 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&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>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1181">toString</a>()</pre>
+<pre>public&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>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1207">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a></code>&nbsp;in 
class&nbsp;<code><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></code></dd>
@@ -2406,7 +2520,7 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 <ul class="blockList">
 <li class="blockList">
 <h4>batchCoprocessorService</h4>
-<pre>public&nbsp;&lt;R extends com.google.protobuf.Message&gt;&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;byte[],R&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1186">batchCoprocessorService</a>(com.google.protobuf.Descriptors.MethodDescriptor&nbsp;methodDescriptor,
+<pre>public&nbsp;&lt;R extends com.google.protobuf.Message&gt;&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;byte[],R&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1212">batchCoprocessorService</a>(com.google.protobuf.Descriptors.MethodDescriptor&nbsp;methodDescriptor,
                                                                                
      com.google.protobuf.Message&nbsp;request,
                                                                                
      byte[]&nbsp;startKey,
                                                                                
      byte[]&nbsp;endKey,
@@ -2447,7 +2561,7 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 <ul class="blockList">
 <li class="blockList">
 <h4>batchCoprocessorService</h4>
-<pre>public&nbsp;&lt;R extends 
com.google.protobuf.Message&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1207">batchCoprocessorService</a>(com.google.protobuf.Descriptors.MethodDescriptor&nbsp;methodDescriptor,
+<pre>public&nbsp;&lt;R extends 
com.google.protobuf.Message&gt;&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1233">batchCoprocessorService</a>(com.google.protobuf.Descriptors.MethodDescriptor&nbsp;methodDescriptor,
                                                                             
com.google.protobuf.Message&nbsp;request,
                                                                             
byte[]&nbsp;startKey,
                                                                             
byte[]&nbsp;endKey,
@@ -2491,7 +2605,7 @@ public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/c
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getRegionLocator</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/RegionLocator.html" 
title="interface in org.apache.hadoop.hbase.client">RegionLocator</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1295">getRegionLocator</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/RegionLocator.html" 
title="interface in org.apache.hadoop.hbase.client">RegionLocator</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/HTable.html#line.1322">getRegionLocator</a>()</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/devapidocs/org/apache/hadoop/hbase/client/Query.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/Query.html 
b/devapidocs/org/apache/hadoop/hbase/client/Query.html
index ae41a27..a2b2382 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/Query.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/Query.html
@@ -451,7 +451,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/client/OperationWithAttr
 <h4>setFilter</h4>
 <pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/Query.html" title="class in 
org.apache.hadoop.hbase.client">Query</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/Query.html#line.63">setFilter</a>(<a
 href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class 
in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;filter)</pre>
 <div class="block">Apply the specified server-side filter when performing the 
Query. Only
- <a 
href="../../../../../org/apache/hadoop/hbase/filter/Filter.html#filterKeyValue-org.apache.hadoop.hbase.Cell-"><code>Filter.filterKeyValue(org.apache.hadoop.hbase.Cell)</code></a>
 is called AFTER all tests for ttl,
+ <a 
href="../../../../../org/apache/hadoop/hbase/filter/Filter.html#filterCell-org.apache.hadoop.hbase.Cell-"><code>Filter.filterCell(org.apache.hadoop.hbase.Cell)</code></a>
 is called AFTER all tests for ttl,
  column match, deletes and column family's max versions have been run.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/devapidocs/org/apache/hadoop/hbase/client/RawAsyncTableImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/RawAsyncTableImpl.html 
b/devapidocs/org/apache/hadoop/hbase/client/RawAsyncTableImpl.html
index b12a838..ebb56d4 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/RawAsyncTableImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/RawAsyncTableImpl.html
@@ -1186,6 +1186,10 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html#getRpcTimeout-java.util.concurrent.TimeUnit-">getRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html" 
title="interface in 
org.apache.hadoop.hbase.client">AsyncTableBase</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>rpc timeout in the specified time unit</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html#getReadRpcTimeout-java.util.concurrent.TimeUnit-"><code>AsyncTableBase.getReadRpcTimeout(TimeUnit)</code></a>,
 
 <a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html#getWriteRpcTimeout-java.util.concurrent.TimeUnit-"><code>AsyncTableBase.getWriteRpcTimeout(TimeUnit)</code></a></dd>
@@ -1204,6 +1208,10 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html#getReadRpcTimeout-java.util.concurrent.TimeUnit-">getReadRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html" 
title="interface in 
org.apache.hadoop.hbase.client">AsyncTableBase</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>read rpc timeout in the specified time unit</dd>
 </dl>
 </li>
 </ul>
@@ -1219,6 +1227,10 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html#getWriteRpcTimeout-java.util.concurrent.TimeUnit-">getWriteRpcTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html" 
title="interface in 
org.apache.hadoop.hbase.client">AsyncTableBase</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>write rpc timeout in the specified time unit</dd>
 </dl>
 </li>
 </ul>
@@ -1234,6 +1246,10 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html#getOperationTimeout-java.util.concurrent.TimeUnit-">getOperationTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html" 
title="interface in 
org.apache.hadoop.hbase.client">AsyncTableBase</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>operation rpc timeout in the specified time unit</dd>
 </dl>
 </li>
 </ul>
@@ -1250,6 +1266,10 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/client/RawAsyncTable.
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html#getScanTimeout-java.util.concurrent.TimeUnit-">getScanTimeout</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncTableBase.html" 
title="interface in 
org.apache.hadoop.hbase.client">AsyncTableBase</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>unit</code> - the unit of time the timeout to be represented in</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>scan rpc timeout in the specified time unit</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00c22388/devapidocs/org/apache/hadoop/hbase/client/Scan.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/Scan.html 
b/devapidocs/org/apache/hadoop/hbase/client/Scan.html
index 7507e64..d471d11 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/Scan.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/Scan.html
@@ -1848,7 +1848,7 @@ public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/Scan.html" ti
 <pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in 
org.apache.hadoop.hbase.client">Scan</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/client/Scan.html#line.691">setFilter</a>(<a
 href="../../../../../org/apache/hadoop/hbase/filter/Filter.html" title="class 
in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;filter)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/client/Query.html#setFilter-org.apache.hadoop.hbase.filter.Filter-">Query</a></code></span></div>
 <div class="block">Apply the specified server-side filter when performing the 
Query. Only
- <a 
href="../../../../../org/apache/hadoop/hbase/filter/Filter.html#filterKeyValue-org.apache.hadoop.hbase.Cell-"><code>Filter.filterKeyValue(org.apache.hadoop.hbase.Cell)</code></a>
 is called AFTER all tests for ttl,
+ <a 
href="../../../../../org/apache/hadoop/hbase/filter/Filter.html#filterCell-org.apache.hadoop.hbase.Cell-"><code>Filter.filterCell(org.apache.hadoop.hbase.Cell)</code></a>
 is called AFTER all tests for ttl,
  column match, deletes and column family's max versions have been run.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>

Reply via email to