hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject [14/52] [partial] hbase-site git commit: Published site at 30d7eeaefe431bc263519064662e6dc8ad8ff05a.
Date Mon, 08 Aug 2016 14:22:10 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/HTableInterface.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/HTableInterface.html b/devapidocs/org/apache/hadoop/hbase/client/HTableInterface.html
index 3af0ae1..8d2e892 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/HTableInterface.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/HTableInterface.html
@@ -186,7 +186,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#append(org.apache.hadoop.hbase.client.Append)">append</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#batch(java.util.List,%20java.lang.Object[])">batch</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#batchCallback(java.util.List,%20java.lang.Object[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">batchCallback</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#batchCoprocessorService(com.google.protobuf.Descriptors.MethodDescriptor,%20com.google.protobuf.Message,%20byte[],%20byte[],%20R)">batchCoprocessorService</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#batchCoprocessorService(com.google.protobuf.Descriptors.MethodDescriptor,%20com.google.protobuf.Message,%20byte[],%20byte[],%20R,%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">batchCoprocessorService</a>, <a href="../../../../../org/apac
 he/hadoop/hbase/client/Table.html#checkAndDelete(byte[],%20byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.client.Delete)">checkAndDelete</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#checkAndDelete(byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.filter.CompareFilter.CompareOp,%20byte[],%20org.apache.hadoop.hbase.client.Delete)">checkAndDelete</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#checkAndMutate(byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.filter.CompareFilter.CompareOp,%20byte[],%20org.apache.hadoop.hbase.client.RowMutations)">checkAndMutate</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#checkAndPut(byte[],%20byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.client.Put)">checkAndPut</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#checkAndPut(byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.filter.CompareFilter.CompareOp,%20byte[],%20org.apache.hadoo
 p.hbase.client.Put)">checkAndPut</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#close()">close</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#coprocessorService(byte[])">coprocessorService</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#coprocessorService(java.lang.Class,%20byte[],%20byte[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Call)">coprocessorService</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#coprocessorService(java.lang.Class,%20byte[],%20byte[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Call,%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">coprocessorService</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#delete(org.apache.hadoop.hbase.client.Delete)">delete</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#delete(java.util.List)">delete</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Tabl
 e.html#exists(org.apache.hadoop.hbase.client.Get)">exists</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#existsAll(java.util.List)">existsAll</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#get(org.apache.hadoop.hbase.client.Get)">get</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#get(java.util.List)">get</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getConfiguration()">getConfiguration</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getName()">getName</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getOperationTimeout()">getOperationTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getRpcTimeout()">getRpcTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(byte[])">getScanner</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(byte[],%20byte[])">ge
 tScanner</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(org.apache.hadoop.hbase.client.Scan)">getScanner</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getTableDescriptor()">getTableDescriptor</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#increment(org.apache.hadoop.hbase.client.Increment)">increment</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#incrementColumnValue(byte[],%20byte[],%20byte[],%20long)">incrementColumnValue</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#incrementColumnValue(byte[],%20byte[],%20byte[],%20long,%20org.apache.hadoop.hbase.client.Durability)">incrementColumnValue</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#mutateRow(org.apache.hadoop.hbase.client.RowMutations)">mutateRow</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#put(java.util.List)">put</a>, <a href="../../../../../org/
 apache/hadoop/hbase/client/Table.html#put(org.apache.hadoop.hbase.client.Put)">put</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setOperationTimeout(int)">setOperationTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setRpcTimeout(int)">setRpcTimeout</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#append(org.apache.hadoop.hbase.client.Append)">append</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#batch(java.util.List,%20java.lang.Object[])">batch</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#batchCallback(java.util.List,%20java.lang.Object[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">batchCallback</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#batchCoprocessorService(com.google.protobuf.Descriptors.MethodDescriptor,%20com.google.protobuf.Message,%20byte[],%20byte[],%20R)">batchCoprocessorService</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#batchCoprocessorService(com.google.protobuf.Descriptors.MethodDescriptor,%20com.google.protobuf.Message,%20byte[],%20byte[],%20R,%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">batchCoprocessorService</a>, <a href="../../../../../org/apac
 he/hadoop/hbase/client/Table.html#checkAndDelete(byte[],%20byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.client.Delete)">checkAndDelete</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#checkAndDelete(byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.filter.CompareFilter.CompareOp,%20byte[],%20org.apache.hadoop.hbase.client.Delete)">checkAndDelete</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#checkAndMutate(byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.filter.CompareFilter.CompareOp,%20byte[],%20org.apache.hadoop.hbase.client.RowMutations)">checkAndMutate</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#checkAndPut(byte[],%20byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.client.Put)">checkAndPut</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#checkAndPut(byte[],%20byte[],%20byte[],%20org.apache.hadoop.hbase.filter.CompareFilter.CompareOp,%20byte[],%20org.apache.hadoo
 p.hbase.client.Put)">checkAndPut</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#close()">close</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#coprocessorService(byte[])">coprocessorService</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#coprocessorService(java.lang.Class,%20byte[],%20byte[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Call)">coprocessorService</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#coprocessorService(java.lang.Class,%20byte[],%20byte[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Call,%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">coprocessorService</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#delete(org.apache.hadoop.hbase.client.Delete)">delete</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#delete(java.util.List)">delete</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Tabl
 e.html#exists(org.apache.hadoop.hbase.client.Get)">exists</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#existsAll(java.util.List)">existsAll</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#get(org.apache.hadoop.hbase.client.Get)">get</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#get(java.util.List)">get</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getConfiguration()">getConfiguration</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getName()">getName</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getOperationTimeout()">getOperationTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout()">getReadRpcTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getRpcTimeout()">getRpcTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(byte[])">getS
 canner</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(byte[],%20byte[])">getScanner</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(org.apache.hadoop.hbase.client.Scan)">getScanner</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getTableDescriptor()">getTableDescriptor</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteRpcTimeout()">getWriteRpcTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#increment(org.apache.hadoop.hbase.client.Increment)">increment</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#incrementColumnValue(byte[],%20byte[],%20byte[],%20long)">incrementColumnValue</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#incrementColumnValue(byte[],%20byte[],%20byte[],%20long,%20org.apache.hadoop.hbase.client.Durability)">incrementColumnValue</a>, <a href="../../../../../org/apache/hado
 op/hbase/client/Table.html#mutateRow(org.apache.hadoop.hbase.client.RowMutations)">mutateRow</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#put(java.util.List)">put</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#put(org.apache.hadoop.hbase.client.Put)">put</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setOperationTimeout(int)">setOperationTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setReadRpcTimeout(int)">setReadRpcTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setRpcTimeout(int)">setRpcTimeout</a>, <a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setWriteRpcTimeout(int)">setWriteRpcTimeout</a></code></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html b/devapidocs/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html
index 6c0a03c..23498ba 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html
@@ -172,6 +172,10 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <td class="colFirst"><code>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#totalFailedPutCount">totalFailedPutCount</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>private int</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#writeRpcTimeout">writeRpcTimeout</a></strong></code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -387,12 +391,21 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <a name="retryInQueue">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>retryInQueue</h4>
 <pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicInteger.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicInteger</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.444">retryInQueue</a></pre>
 </li>
 </ul>
+<a name="writeRpcTimeout">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>writeRpcTimeout</h4>
+<pre>private final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.445">writeRpcTimeout</a></pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -407,7 +420,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HTableMultiplexer.FlushWorker</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.446">HTableMultiplexer.FlushWorker</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.447">HTableMultiplexer.FlushWorker</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                              <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/HRegionLocation.html" title="class in org.apache.hadoop.hbase">HRegionLocation</a>&nbsp;addr,
                              <a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer</a>&nbsp;htableMultiplexer,
@@ -430,7 +443,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getQueue</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/LinkedBlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">LinkedBlockingQueue</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.PutStatus.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer.PutStatus</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.459">getQueue</a>()</pre>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/LinkedBlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">LinkedBlockingQueue</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.PutStatus.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer.PutStatus</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.463">getQueue</a>()</pre>
 </li>
 </ul>
 <a name="getTotalFailedCount()">
@@ -439,7 +452,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getTotalFailedCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.463">getTotalFailedCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.467">getTotalFailedCount</a>()</pre>
 </li>
 </ul>
 <a name="getTotalBufferedCount()">
@@ -448,7 +461,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getTotalBufferedCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.467">getTotalBufferedCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.471">getTotalBufferedCount</a>()</pre>
 </li>
 </ul>
 <a name="getAverageLatencyCounter()">
@@ -457,7 +470,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getAverageLatencyCounter</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.AtomicAverageCounter.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer.AtomicAverageCounter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.471">getAverageLatencyCounter</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.AtomicAverageCounter.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer.AtomicAverageCounter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.475">getAverageLatencyCounter</a>()</pre>
 </li>
 </ul>
 <a name="getMaxLatency()">
@@ -466,7 +479,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getMaxLatency</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.475">getMaxLatency</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.479">getMaxLatency</a>()</pre>
 </li>
 </ul>
 <a name="resubmitFailedPut(org.apache.hadoop.hbase.client.HTableMultiplexer.PutStatus, org.apache.hadoop.hbase.HRegionLocation)">
@@ -475,7 +488,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>resubmitFailedPut</h4>
-<pre>boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.479">resubmitFailedPut</a>(<a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.PutStatus.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer.PutStatus</a>&nbsp;ps,
+<pre>boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.483">resubmitFailedPut</a>(<a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.PutStatus.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer.PutStatus</a>&nbsp;ps,
                         <a href="../../../../../org/apache/hadoop/hbase/HRegionLocation.html" title="class in org.apache.hadoop.hbase">HRegionLocation</a>&nbsp;oldLoc)
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -488,7 +501,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getNextDelay</h4>
-<pre>long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.526">getNextDelay</a>(int&nbsp;retryCount)</pre>
+<pre>long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.530">getNextDelay</a>(int&nbsp;retryCount)</pre>
 </li>
 </ul>
 <a name="getRetryInQueue()">
@@ -497,7 +510,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getRetryInQueue</h4>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicInteger.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicInteger</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.532">getRetryInQueue</a>()</pre>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicInteger.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicInteger</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.536">getRetryInQueue</a>()</pre>
 </li>
 </ul>
 <a name="getMaxRetryInQueue()">
@@ -506,7 +519,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getMaxRetryInQueue</h4>
-<pre>int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.537">getMaxRetryInQueue</a>()</pre>
+<pre>int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.541">getMaxRetryInQueue</a>()</pre>
 </li>
 </ul>
 <a name="getTotalFailedPutCount()">
@@ -515,7 +528,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getTotalFailedPutCount</h4>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.542">getTotalFailedPutCount</a>()</pre>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicLong</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.546">getTotalFailedPutCount</a>()</pre>
 </li>
 </ul>
 <a name="getMultiplexer()">
@@ -524,7 +537,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getMultiplexer</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.547">getMultiplexer</a>()</pre>
+<pre><a href="../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.html" title="class in org.apache.hadoop.hbase.client">HTableMultiplexer</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.551">getMultiplexer</a>()</pre>
 </li>
 </ul>
 <a name="getExecutor()">
@@ -533,7 +546,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutor</h4>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ScheduledExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ScheduledExecutorService</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.552">getExecutor</a>()</pre>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ScheduledExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ScheduledExecutorService</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.556">getExecutor</a>()</pre>
 </li>
 </ul>
 <a name="run()">
@@ -542,7 +555,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.557">run</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#line.561">run</a>()</pre>
 <dl>
 <dt><strong>Specified by:</strong></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true#run()" title="class or interface in java.lang">run</a></code>&nbsp;in interface&nbsp;<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html b/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html
index 6687df4..8b24b31 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html
@@ -395,42 +395,54 @@ implements <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getRpcTimeout()">getRpcTimeout</a></strong>()</code>
-<div class="block">Get timeout (millisecond) of each rpc request in this Table instance.</div>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getReadRpcTimeout()">getReadRpcTimeout</a></strong>()</code>
+<div class="block">Get timeout (millisecond) of each rpc read request in this Table instance.</div>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getRpcTimeout()">getRpcTimeout</a></strong>()</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;</div>
+</td>
+</tr>
+<tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getScanner(byte[])">getScanner</a></strong>(byte[]&nbsp;family)</code>
 <div class="block">Gets a scanner on the current table for the given family.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getScanner(byte[],%20byte[])">getScanner</a></strong>(byte[]&nbsp;family,
                     byte[]&nbsp;qualifier)</code>
 <div class="block">Gets a scanner on the current table for the given family and qualifier.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getScanner(org.apache.hadoop.hbase.client.Scan)">getScanner</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan)</code>
 <div class="block">Returns a scanner on the current table as specified by the <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a>
  object.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getTableDescriptor()">getTableDescriptor</a></strong>()</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 class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getWriteBufferSize()">getWriteBufferSize</a></strong>()</code>
 <div class="block">Returns the maximum size in bytes of the write buffer for this HTable.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#getWriteRpcTimeout()">getWriteRpcTimeout</a></strong>()</code>
+<div class="block">Get timeout (millisecond) of each rpc write request in this Table instance.</div>
+</td>
+</tr>
 <tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#increment(org.apache.hadoop.hbase.client.Increment)">increment</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/client/Increment.html" title="class in org.apache.hadoop.hbase.client">Increment</a>&nbsp;increment)</code>
@@ -487,17 +499,30 @@ implements <a href="../../../../../org/apache/hadoop/hbase/client/Table.html" ti
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#setRpcTimeout(int)">setRpcTimeout</a></strong>(int&nbsp;rpcTimeout)</code>
-<div class="block">Set timeout (millisecond) of each rpc request in operations of this Table instance, will
- override the value of hbase.rpc.timeout in configuration.</div>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#setReadRpcTimeout(int)">setReadRpcTimeout</a></strong>(int&nbsp;readRpcTimeout)</code>
+<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.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#setRpcTimeout(int)">setRpcTimeout</a></strong>(int&nbsp;rpcTimeout)</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#setWriteBufferSize(long)">setWriteBufferSize</a></strong>(long&nbsp;writeBufferSize)</code>
 <div class="block">Sets the size of the buffer in bytes.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HTableWrapper.html#setWriteRpcTimeout(int)">setWriteRpcTimeout</a></strong>(int&nbsp;writeRpcTimeout)</code>
+<div class="block">Set timeout (millisecond) of each rpc write request in operations of this Table instance, will
+ override the value of hbase.rpc.write.timeout in configuration.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
@@ -1482,25 +1507,67 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.
 <ul class="blockList">
 <li class="blockList">
 <h4>setRpcTimeout</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableWrapper.html#line.311">setRpcTimeout</a>(int&nbsp;rpcTimeout)</pre>
+<pre><a href="http://docs.oracle.com/javase/7/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/HTableWrapper.html#line.312">setRpcTimeout</a>(int&nbsp;rpcTimeout)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;</div>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setRpcTimeout(int)">Table</a></code></strong></div>
 <div class="block">Set timeout (millisecond) of each rpc request in operations of this Table instance, will
  override the value of hbase.rpc.timeout in configuration.
  If a rpc request waiting too long, it will stop waiting and send a new request to retry until
- retries exhausted or operation timeout reached.</div>
+ retries exhausted or operation timeout reached.
+ <p>
+ NOTE: This will set both the read and write timeout settings to the provided value.</div>
 <dl>
 <dt><strong>Specified by:</strong></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setRpcTimeout(int)">setRpcTimeout</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="strong">Parameters:</span></dt><dd><code>rpcTimeout</code> - the timeout of each rpc request in millisecond.</dd></dl>
 </li>
 </ul>
+<a name="setWriteRpcTimeout(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setWriteRpcTimeout</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableWrapper.html#line.317">setWriteRpcTimeout</a>(int&nbsp;writeRpcTimeout)</pre>
+<div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setWriteRpcTimeout(int)">Table</a></code></strong></div>
+<div class="block">Set timeout (millisecond) of each rpc write request in operations of this Table instance, will
+ override the value of hbase.rpc.write.timeout in configuration.
+ If a rpc write 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><strong>Specified by:</strong></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>
+</dl>
+</li>
+</ul>
+<a name="setReadRpcTimeout(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setReadRpcTimeout</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableWrapper.html#line.320">setReadRpcTimeout</a>(int&nbsp;readRpcTimeout)</pre>
+<div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setReadRpcTimeout(int)">Table</a></code></strong></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><strong>Specified by:</strong></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>
+</dl>
+</li>
+</ul>
 <a name="getRpcTimeout()">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getRpcTimeout</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableWrapper.html#line.316">getRpcTimeout</a>()</pre>
+<pre><a href="http://docs.oracle.com/javase/7/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/HTableWrapper.html#line.324">getRpcTimeout</a>()</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;</div>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getRpcTimeout()">Table</a></code></strong></div>
 <div class="block">Get timeout (millisecond) of each rpc request in this Table instance.</div>
 <dl>
@@ -1509,6 +1576,36 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.
 </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/HTableWrapper.html#line.329">getWriteRpcTimeout</a>()</pre>
+<div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteRpcTimeout()">Table</a></code></strong></div>
+<div class="block">Get timeout (millisecond) of each rpc write request in this Table instance.</div>
+<dl>
+<dt><strong>Specified by:</strong></dt>
+<dd><code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteRpcTimeout()">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>
+</dl>
+</li>
+</ul>
+<a name="getReadRpcTimeout()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getReadRpcTimeout</h4>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/HTableWrapper.html#line.332">getReadRpcTimeout</a>()</pre>
+<div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout()">Table</a></code></strong></div>
+<div class="block">Get timeout (millisecond) of each rpc read request in this Table instance.</div>
+<dl>
+<dt><strong>Specified by:</strong></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>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/Table.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/Table.html b/devapidocs/org/apache/hadoop/hbase/client/Table.html
index 5904ca8..7e72864 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/Table.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/Table.html
@@ -328,37 +328,45 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getRpcTimeout()">getRpcTimeout</a></strong>()</code>
-<div class="block">Get timeout (millisecond) of each rpc request in this Table instance.</div>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getReadRpcTimeout()">getReadRpcTimeout</a></strong>()</code>
+<div class="block">Get timeout (millisecond) of each rpc read request in this Table instance.</div>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getRpcTimeout()">getRpcTimeout</a></strong>()</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>Use getReadRpcTimeout or getWriteRpcTimeout instead</i></div>
+</div>
+</td>
+</tr>
+<tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(byte[])">getScanner</a></strong>(byte[]&nbsp;family)</code>
 <div class="block">Gets a scanner on the current table for the given family.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(byte[],%20byte[])">getScanner</a></strong>(byte[]&nbsp;family,
                     byte[]&nbsp;qualifier)</code>
 <div class="block">Gets a scanner on the current table for the given family and qualifier.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getScanner(org.apache.hadoop.hbase.client.Scan)">getScanner</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan)</code>
 <div class="block">Returns a scanner on the current table as specified by the <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client"><code>Scan</code></a>
  object.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getTableDescriptor()">getTableDescriptor</a></strong>()</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 class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteBufferSize()">getWriteBufferSize</a></strong>()</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
@@ -366,6 +374,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html
 </div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getWriteRpcTimeout()">getWriteRpcTimeout</a></strong>()</code>
+<div class="block">Get timeout (millisecond) of each rpc write request in this Table instance.</div>
+</td>
+</tr>
 <tr 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><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#increment(org.apache.hadoop.hbase.client.Increment)">increment</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/client/Increment.html" title="class in org.apache.hadoop.hbase.client">Increment</a>&nbsp;increment)</code>
@@ -418,13 +432,21 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setRpcTimeout(int)">setRpcTimeout</a></strong>(int&nbsp;rpcTimeout)</code>
-<div class="block">Set timeout (millisecond) of each rpc request in operations of this Table instance, will
- override the value of hbase.rpc.timeout in configuration.</div>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setReadRpcTimeout(int)">setReadRpcTimeout</a></strong>(int&nbsp;readRpcTimeout)</code>
+<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.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setRpcTimeout(int)">setRpcTimeout</a></strong>(int&nbsp;rpcTimeout)</code>
+<div class="block"><strong>Deprecated.</strong>&nbsp;
+<div class="block"><i>Use setReadRpcTimeout or setWriteRpcTimeout instead</i></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setWriteBufferSize(long)">setWriteBufferSize</a></strong>(long&nbsp;writeBufferSize)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
 <div class="block"><i>as of 1.0.1 (should not have been in 1.0.0). Replaced by <a href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client"><code>BufferedMutator</code></a> and
@@ -432,6 +454,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html
 </div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#setWriteRpcTimeout(int)">setWriteRpcTimeout</a></strong>(int&nbsp;writeRpcTimeout)</code>
+<div class="block">Set timeout (millisecond) of each rpc write request in operations of this Table instance, will
+ override the value of hbase.rpc.write.timeout in configuration.</div>
+</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -1173,28 +1202,82 @@ void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Table.
 <div class="block">Get timeout (millisecond) of each operation for in Table instance.</div>
 </li>
 </ul>
+<a name="getRpcTimeout()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRpcTimeout</h4>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Table.html#line.594">getRpcTimeout</a>()</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>Use getReadRpcTimeout or getWriteRpcTimeout instead</i></div>
+<div class="block">Get timeout (millisecond) of each rpc request in this Table instance.</div>
+</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/Table.html#line.594">setRpcTimeout</a>(int&nbsp;rpcTimeout)</pre>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Table.html#line.609">setRpcTimeout</a>(int&nbsp;rpcTimeout)</pre>
+<div class="block"><span class="strong">Deprecated.</span>&nbsp;<i>Use setReadRpcTimeout or setWriteRpcTimeout instead</i></div>
 <div class="block">Set timeout (millisecond) of each rpc request in operations of this Table instance, will
  override the value of hbase.rpc.timeout in configuration.
  If a rpc request waiting too long, it will stop waiting and send a new request to retry until
- retries exhausted or operation timeout reached.</div>
+ retries exhausted or operation timeout reached.
+ <p>
+ NOTE: This will set both the read and write timeout settings to the provided value.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>rpcTimeout</code> - the timeout of each rpc request in millisecond.</dd></dl>
 </li>
 </ul>
-<a name="getRpcTimeout()">
+<a name="getReadRpcTimeout()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getReadRpcTimeout</h4>
+<pre>int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Table.html#line.614">getReadRpcTimeout</a>()</pre>
+<div class="block">Get timeout (millisecond) of each rpc read request in this Table instance.</div>
+</li>
+</ul>
+<a name="setReadRpcTimeout(int)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setReadRpcTimeout</h4>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Table.html#line.624">setReadRpcTimeout</a>(int&nbsp;readRpcTimeout)</pre>
+<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="strong">Parameters:</span></dt><dd><code>readRpcTimeout</code> - </dd></dl>
+</li>
+</ul>
+<a name="getWriteRpcTimeout()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getWriteRpcTimeout</h4>
+<pre>int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Table.html#line.629">getWriteRpcTimeout</a>()</pre>
+<div class="block">Get timeout (millisecond) of each rpc write request in this Table instance.</div>
+</li>
+</ul>
+<a name="setWriteRpcTimeout(int)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getRpcTimeout</h4>
-<pre>int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Table.html#line.599">getRpcTimeout</a>()</pre>
-<div class="block">Get timeout (millisecond) of each rpc request in this Table instance.</div>
+<h4>setWriteRpcTimeout</h4>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Table.html#line.639">setWriteRpcTimeout</a>(int&nbsp;writeRpcTimeout)</pre>
+<div class="block">Set timeout (millisecond) of each rpc write request in operations of this Table instance, will
+ override the value of hbase.rpc.write.timeout in configuration.
+ If a rpc write 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="strong">Parameters:</span></dt><dd><code>writeRpcTimeout</code> - </dd></dl>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html b/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html
index c8e884d..7cf401d 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html
@@ -260,7 +260,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client">TableState.State</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TableState.State.html#line.24">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client">TableState.State</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TableState.State.html#line.220">values</a>()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
@@ -277,7 +277,7 @@ for (TableState.State c : TableState.State.values())
 <ul class="blockList">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client">TableState.State</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TableState.State.html#line.24">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client">TableState.State</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TableState.State.html#line.220">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html b/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html
index fb80321..b7a6a60 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html
@@ -137,13 +137,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span class="strong">ExponentialClientBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span class="strong">ClientBackoffPolicyFactory.NoBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.NoBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
                             byte[]&nbsp;region,
                             <a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ServerStatistics.html" title="class in org.apache.hadoop.hbase.client.backoff">ServerStatistics</a>&nbsp;stats)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span class="strong">ClientBackoffPolicyFactory.NoBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.NoBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span class="strong">ExponentialClientBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
                             byte[]&nbsp;region,
                             <a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ServerStatistics.html" title="class in org.apache.hadoop.hbase.client.backoff">ServerStatistics</a>&nbsp;stats)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html
index 4d6fb4f..ae87084 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html
@@ -171,13 +171,13 @@ service.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
-<td class="colLast"><span class="strong">Connection.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Connection.html#getAdmin()">getAdmin</a></strong>()</code>
-<div class="block">Retrieve an Admin implementation to administer an HBase cluster.</div>
-</td>
+<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getAdmin()">getAdmin</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
-<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getAdmin()">getAdmin</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Connection.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Connection.html#getAdmin()">getAdmin</a></strong>()</code>
+<div class="block">Retrieve an Admin implementation to administer an HBase cluster.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -261,7 +261,7 @@ service.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">NormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
+<td class="colLast"><span class="strong">MergeNormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
 <div class="block">Executes normalization plan on cluster (does actual splitting/merging work).</div>
 </td>
 </tr>
@@ -273,14 +273,14 @@ service.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">MergeNormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
-<div class="block">Executes normalization plan on cluster (does actual splitting/merging work).</div>
+<td class="colLast"><span class="strong">EmptyNormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/EmptyNormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
+<div class="block">No-op for empty plan.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">EmptyNormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/EmptyNormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
-<div class="block">No-op for empty plan.</div>
+<td class="colLast"><span class="strong">NormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
+<div class="block">Executes normalization plan on cluster (does actual splitting/merging work).</div>
 </td>
 </tr>
 </tbody>
@@ -493,21 +493,21 @@ service.</div>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
-<td class="colLast"><span class="strong">ConnectionCache.ConnectionInfo.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/ConnectionCache.ConnectionInfo.html#admin">admin</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
 <td class="colLast"><span class="strong">HBaseFsck.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/HBaseFsck.html#admin">admin</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
 <td class="colLast"><span class="strong">RegionMover.MoveWithAck.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/RegionMover.MoveWithAck.html#admin">admin</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
 <td class="colLast"><span class="strong">RegionMover.MoveWithoutAck.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/RegionMover.MoveWithoutAck.html#admin">admin</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
+<td class="colLast"><span class="strong">ConnectionCache.ConnectionInfo.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/ConnectionCache.ConnectionInfo.html#admin">admin</a></strong></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/class-use/Append.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Append.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/Append.html
index bf6124a..a882d4a 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Append.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Append.html
@@ -199,13 +199,13 @@ service.</div>
 <tbody>
 <tr class="altColor">
 <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"><span class="strong">HTable.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HTable.html#append(org.apache.hadoop.hbase.client.Append)">append</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Append.html" title="class in org.apache.hadoop.hbase.client">Append</a>&nbsp;append)</code>
+<td class="colLast"><span class="strong">Table.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Table.html#append(org.apache.hadoop.hbase.client.Append)">append</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Append.html" title="class in org.apache.hadoop.hbase.client">Append</a>&nbsp;append)</code>
 <div class="block">Appends values to one or more columns within a single row.</div>
 </td>
 </tr>
 <tr 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"><span class="strong">Table.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Table.html#append(org.apache.hadoop.hbase.client.Append)">append</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Append.html" title="class in org.apache.hadoop.hbase.client">Append</a>&nbsp;append)</code>
+<td class="colLast"><span class="strong">HTable.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HTable.html#append(org.apache.hadoop.hbase.client.Append)">append</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Append.html" title="class in org.apache.hadoop.hbase.client">Append</a>&nbsp;append)</code>
 <div class="block">Appends values to one or more columns within a single row.</div>
 </td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncProcess.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncProcess.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncProcess.html
index a7f70bb..46b4fb7 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncProcess.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/AsyncProcess.html
@@ -97,13 +97,13 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/AsyncProcess.html" title="class in org.apache.hadoop.hbase.client">AsyncProcess</a></code></td>
-<td class="colLast"><span class="strong">HTableMultiplexer.FlushWorker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#ap">ap</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/client/AsyncProcess.html" title="class in org.apache.hadoop.hbase.client">AsyncProcess</a></code></td>
 <td class="colLast"><span class="strong">BufferedMutatorImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#ap">ap</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/AsyncProcess.html" title="class in org.apache.hadoop.hbase.client">AsyncProcess</a></code></td>
+<td class="colLast"><span class="strong">HTableMultiplexer.FlushWorker.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HTableMultiplexer.FlushWorker.html#ap">ap</a></strong></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/AsyncProcess.html" title="class in org.apache.hadoop.hbase.client">AsyncProcess</a></code></td>
 <td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#asyncProcess">asyncProcess</a></strong></code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.ExceptionListener.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.ExceptionListener.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.ExceptionListener.html
index 06d6db1..c649da1 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.ExceptionListener.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.ExceptionListener.html
@@ -98,11 +98,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator.ExceptionListener</a></code></td>
-<td class="colLast"><span class="strong">BufferedMutatorParams.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html#listener">listener</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">BufferedMutatorImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#listener">listener</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator.ExceptionListener</a></code></td>
-<td class="colLast"><span class="strong">BufferedMutatorImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorImpl.html#listener">listener</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">BufferedMutatorParams.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html#listener">listener</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.html
index 6bc315d..6cc7c28 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutator.html
@@ -137,25 +137,25 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator</a></code></td>
+<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getBufferedMutator(org.apache.hadoop.hbase.client.BufferedMutatorParams)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html" title="class in org.apache.hadoop.hbase.client">BufferedMutatorParams</a>&nbsp;params)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator</a></code></td>
 <td class="colLast"><span class="strong">Connection.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Connection.html#getBufferedMutator(org.apache.hadoop.hbase.client.BufferedMutatorParams)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html" title="class in org.apache.hadoop.hbase.client">BufferedMutatorParams</a>&nbsp;params)</code>
 <div class="block">Retrieve a <a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client"><code>BufferedMutator</code></a> for performing client-side buffering of writes.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator</a></code></td>
-<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getBufferedMutator(org.apache.hadoop.hbase.client.BufferedMutatorParams)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html" title="class in org.apache.hadoop.hbase.client">BufferedMutatorParams</a>&nbsp;params)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getBufferedMutator(org.apache.hadoop.hbase.TableName)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator</a></code></td>
 <td class="colLast"><span class="strong">Connection.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Connection.html#getBufferedMutator(org.apache.hadoop.hbase.TableName)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</code>
 <div class="block">
  Retrieve a <a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client"><code>BufferedMutator</code></a> for performing client-side buffering of writes.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator</a></code></td>
-<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getBufferedMutator(org.apache.hadoop.hbase.TableName)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</code>&nbsp;</td>
-</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5d8deaf/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutatorParams.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutatorParams.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutatorParams.html
index 7a4c205..964f54a 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutatorParams.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/BufferedMutatorParams.html
@@ -136,13 +136,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator</a></code></td>
-<td class="colLast"><span class="strong">Connection.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Connection.html#getBufferedMutator(org.apache.hadoop.hbase.client.BufferedMutatorParams)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html" title="class in org.apache.hadoop.hbase.client">BufferedMutatorParams</a>&nbsp;params)</code>
-<div class="block">Retrieve a <a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client"><code>BufferedMutator</code></a> for performing client-side buffering of writes.</div>
-</td>
+<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getBufferedMutator(org.apache.hadoop.hbase.client.BufferedMutatorParams)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html" title="class in org.apache.hadoop.hbase.client">BufferedMutatorParams</a>&nbsp;params)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client">BufferedMutator</a></code></td>
-<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getBufferedMutator(org.apache.hadoop.hbase.client.BufferedMutatorParams)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html" title="class in org.apache.hadoop.hbase.client">BufferedMutatorParams</a>&nbsp;params)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Connection.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Connection.html#getBufferedMutator(org.apache.hadoop.hbase.client.BufferedMutatorParams)">getBufferedMutator</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutatorParams.html" title="class in org.apache.hadoop.hbase.client">BufferedMutatorParams</a>&nbsp;params)</code>
+<div class="block">Retrieve a <a href="../../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface in org.apache.hadoop.hbase.client"><code>BufferedMutator</code></a> for performing client-side buffering of writes.</div>
+</td>
 </tr>
 </tbody>
 </table>


Mime
View raw message