http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4dc2a2e8/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/apidocs/overview-tree.html b/apidocs/overview-tree.html
index d331c6f..72a723d 100644
--- a/apidocs/overview-tree.html
+++ b/apidocs/overview-tree.html
@@ -891,32 +891,32 @@
 <li type="circle">java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.util.<a 
href="org/apache/hadoop/hbase/util/Order.html" title="enum in 
org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">MemoryCompactionPolicy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">KeepDeletedCells</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">MemoryCompactionPolicy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/CompareOperator.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">CompareOperator</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/CellBuilderType.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">CellBuilderType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum 
in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in 
org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">FilterList.Operator</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum 
in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">CompareFilter.CompareOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum 
in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in 
org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.encoding.<a 
href="org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html" title="enum 
in org.apache.hadoop.hbase.io.encoding"><span 
class="typeNameLink">DataBlockEncoding</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in 
org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">SpaceViolationPolicy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum 
in org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">ThrottlingException.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">QuotaScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">QuotaType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">ThrottleType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">QuotaType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">SpaceViolationPolicy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Durability.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MasterSwitchType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/CompactType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">IsolationLevel</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Scan.ReadType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/CompactionState.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactionState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MasterSwitchType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Scan.ReadType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RequestController.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">IsolationLevel</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/Consistency.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Consistency</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/CompactType.html" title="enum in 
org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.security.<a 
href="org/apache/hadoop/hbase/client/security/SecurityCapability.html" 
title="enum in org.apache.hadoop.hbase.client.security"><span 
class="typeNameLink">SecurityCapability</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4dc2a2e8/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html 
b/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
index a0ae102..1d2d704 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -149,7 +149,7 @@
 <span class="sourceLineNo">141</span><a name="line.141"></a>
 <span class="sourceLineNo">142</span>    // Always have masters and 
regionservers come up on port '0' so we don't<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    // clash over default ports.<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    if 
(conf.getBoolean(ASSIGN_RANDOM_PORTS, true)) {<a name="line.144"></a>
+<span class="sourceLineNo">144</span>    if 
(conf.getBoolean(ASSIGN_RANDOM_PORTS, false)) {<a name="line.144"></a>
 <span class="sourceLineNo">145</span>      conf.set(HConstants.MASTER_PORT, 
"0");<a name="line.145"></a>
 <span class="sourceLineNo">146</span>      
conf.set(HConstants.REGIONSERVER_PORT, "0");<a name="line.146"></a>
 <span class="sourceLineNo">147</span>      if 
(conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) {<a 
name="line.147"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4dc2a2e8/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index 27131f0..79cba7d 100644
--- a/book.html
+++ b/book.html
@@ -5203,6 +5203,18 @@ config.set(<span class="string"><span 
class="delimiter">&quot;</span><span class
 </div>
 </div>
 </div>
+<div class="sect2">
+<h3 id="config_timeouts"><a class="anchor" href="#config_timeouts"></a>7.6. 
Timeout settings</h3>
+<div class="paragraph">
+<p>HBase provides many timeout settings to limit the execution time of 
different remote operations.</p>
+</div>
+<div class="paragraph">
+<p>The <code>hbase.rpc.timeout</code> property limits how long an RPC call can 
run before it times out.
+You can also specify a timeout for read and write operations using 
<code>hbase.rpc.read.timeout</code> and <code>hbase.rpc.write.timeout</code> 
configuration properties. In the absence of these properties 
<code>hbase.rpc.timeout</code> will be used.
+A higher-level timeout is <code>hbase.client.operation.timeout</code> which is 
valid for each client call.
+Timeout for scan operations is controlled differently. To set it you can use 
<code>hbase.client.scanner.timeout.period</code> property.</p>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -37288,7 +37300,7 @@ The server will return cellblocks compressed using this 
same compressor as long
 <div id="footer">
 <div id="footer-text">
 Version 3.0.0-SNAPSHOT<br>
-Last updated 2018-03-21 14:29:53 UTC
+Last updated 2018-03-22 14:29:40 UTC
 </div>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4dc2a2e8/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index 35a5363..2a63526 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180321" />
+    <meta name="Date-Revision-yyyymmdd" content="20180322" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Bulk Loads in Apache HBase (TM)
@@ -299,7 +299,7 @@ under the License. -->
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2018-03-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2018-03-22</li>
             </p>
                 </div>
 

Reply via email to