Return-Path: 
 <commits-return-29662-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 75A83185DF
	for <apmail-hbase-commits-archive@www.apache.org>;
 Mon,  7 Dec 2015 17:55:21 +0000 (UTC)
Received: (qmail 91876 invoked by uid 500); 7 Dec 2015 17:55:12 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 91712 invoked by uid 500); 7 Dec 2015 17:55:12 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 91610 invoked by uid 99); 7 Dec 2015 17:55:12 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2015 17:55:12 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id CB9E4E027D; Mon,  7 Dec 2015 17:55:11 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: misty@apache.org
To: commits@hbase.apache.org
Date: Mon, 07 Dec 2015 17:55:12 -0000
Message-Id: <92c2278c81b44cff850f680a03e40623@git.apache.org>
In-Reply-To: <3f66068f6723471db9dafa662712c04a@git.apache.org>
References: <3f66068f6723471db9dafa662712c04a@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [02/51] [partial] hbase git commit: Published site at
 8bf70144e40650ef972f005e2465bd0e2a087c40.

http://git-wip-us.apache.org/repos/asf/hbase/blob/2dc53cb9/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
index ce10b1c..9b19251 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
@@ -108,7 +108,7 @@
 </dl>
 <hr>
 <br>
-<pre>static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.197">ThriftServerRunner.ImplType</a>
+<pre>static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.206">ThriftServerRunner.ImplType</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&gt;</pre>
 <div class="block">An enum of server implementation selections</div>
 </li>
@@ -267,7 +267,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>HS_HA</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.198">HS_HA</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.207">HS_HA</a></pre>
 </li>
 </ul>
 <a name="NONBLOCKING">
@@ -276,7 +276,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>NONBLOCKING</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.199">NONBLOCKING</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.208">NONBLOCKING</a></pre>
 </li>
 </ul>
 <a name="THREAD_POOL">
@@ -285,7 +285,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>THREAD_POOL</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.200">THREAD_POOL</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.209">THREAD_POOL</a></pre>
 </li>
 </ul>
 <a name="THREADED_SELECTOR">
@@ -294,7 +294,7 @@ the order they are declared.</div>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>THREADED_SELECTOR</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.201">THREADED_SELECTOR</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.210">THREADED_SELECTOR</a></pre>
 </li>
 </ul>
 </li>
@@ -311,7 +311,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.204">DEFAULT</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.213">DEFAULT</a></pre>
 </li>
 </ul>
 <a name="option">
@@ -320,7 +320,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>option</h4>
-<pre>final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.206">option</a></pre>
+<pre>final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.215">option</a></pre>
 </li>
 </ul>
 <a name="isAlwaysFramed">
@@ -329,7 +329,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>isAlwaysFramed</h4>
-<pre>final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.207">isAlwaysFramed</a></pre>
+<pre>final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.216">isAlwaysFramed</a></pre>
 </li>
 </ul>
 <a name="serverClass">
@@ -338,7 +338,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>serverClass</h4>
-<pre>final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.apache.thrift.server.TServer&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.208">serverClass</a></pre>
+<pre>final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.apache.thrift.server.TServer&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.217">serverClass</a></pre>
 </li>
 </ul>
 <a name="canSpecifyBindIP">
@@ -347,7 +347,7 @@ the order they are declared.</div>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>canSpecifyBindIP</h4>
-<pre>final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.209">canSpecifyBindIP</a></pre>
+<pre>final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.218">canSpecifyBindIP</a></pre>
 </li>
 </ul>
 </li>
@@ -364,7 +364,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/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.197">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.206">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:
@@ -381,7 +381,7 @@ for (ThriftServerRunner.ImplType c : ThriftServerRunner.ImplType.values())
 <ul class="blockList">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.197">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/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.206">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 
@@ -399,7 +399,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<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;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.224">toString</a>()</pre>
+<pre>public&nbsp;<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;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.233">toString</a>()</pre>
 <dl>
 <dt><strong>Overrides:</strong></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true#toString()" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&gt;</code></dd>
@@ -413,7 +413,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>getDescription</h4>
-<pre><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;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.228">getDescription</a>()</pre>
+<pre><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;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.237">getDescription</a>()</pre>
 </li>
 </ul>
 <a name="createOptionGroup()">
@@ -422,7 +422,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>createOptionGroup</h4>
-<pre>static&nbsp;org.apache.commons.cli.OptionGroup&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.240">createOptionGroup</a>()</pre>
+<pre>static&nbsp;org.apache.commons.cli.OptionGroup&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.249">createOptionGroup</a>()</pre>
 </li>
 </ul>
 <a name="getServerImpl(org.apache.hadoop.conf.Configuration)">
@@ -431,7 +431,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>getServerImpl</h4>
-<pre>static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.248">getServerImpl</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.257">getServerImpl</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 <a name="setServerImpl(org.apache.commons.cli.CommandLine, org.apache.hadoop.conf.Configuration)">
@@ -440,7 +440,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>setServerImpl</h4>
-<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.258">setServerImpl</a>(org.apache.commons.cli.CommandLine&nbsp;cmd,
+<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.267">setServerImpl</a>(org.apache.commons.cli.CommandLine&nbsp;cmd,
                  org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
@@ -450,7 +450,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>simpleClassName</h4>
-<pre>public&nbsp;<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;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.278">simpleClassName</a>()</pre>
+<pre>public&nbsp;<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;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.287">simpleClassName</a>()</pre>
 </li>
 </ul>
 <a name="serversThatCannotSpecifyBindIP()">
@@ -459,7 +459,7 @@ not permitted.)</div>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>serversThatCannotSpecifyBindIP</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<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>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.282">serversThatCannotSpecifyBindIP</a>()</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<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>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.291">serversThatCannotSpecifyBindIP</a>()</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2dc53cb9/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
index 64b7024..3eab083 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
@@ -99,7 +99,7 @@
 </dl>
 <hr>
 <br>
-<pre>protected static class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.614">ThriftServerRunner.ResultScannerWrapper</a>
+<pre>protected static class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.625">ThriftServerRunner.ResultScannerWrapper</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -196,7 +196,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>scanner</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.616">scanner</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.627">scanner</a></pre>
 </li>
 </ul>
 <a name="sortColumns">
@@ -205,7 +205,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>sortColumns</h4>
-<pre>private final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.617">sortColumns</a></pre>
+<pre>private final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.628">sortColumns</a></pre>
 </li>
 </ul>
 </li>
@@ -222,7 +222,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ThriftServerRunner.ResultScannerWrapper</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.618">ThriftServerRunner.ResultScannerWrapper</a>(<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;resultScanner,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.629">ThriftServerRunner.ResultScannerWrapper</a>(<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;resultScanner,
                                        boolean&nbsp;sortResultColumns)</pre>
 </li>
 </ul>
@@ -240,7 +240,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getScanner</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.624">getScanner</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.635">getScanner</a>()</pre>
 </li>
 </ul>
 <a name="isColumnSorted()">
@@ -249,7 +249,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isColumnSorted</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.628">isColumnSorted</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.639">isColumnSorted</a>()</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2dc53cb9/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
index 5ae3602..56a74ad 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
@@ -262,6 +262,17 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT">THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY">THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY</a></strong></code>
+<div class="block">Amount of time in milliseconds before a server thread will timeout
+ waiting for client to send data on a connected socket.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>(package private) static <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></code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#THRIFT_SSL_ENABLED">THRIFT_SSL_ENABLED</a></strong></code>&nbsp;</td>
 </tr>
@@ -531,13 +542,36 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.THRIFT_SSL_KEYSTORE_KEYPASSWORD">Constant Field Values</a></dd></dl>
 </li>
 </ul>
+<a name="THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY</h4>
+<pre>public static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.168">THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY</a></pre>
+<div class="block">Amount of time in milliseconds before a server thread will timeout
+ waiting for client to send data on a connected socket. Currently,
+ applies only to TBoundedThreadPoolServer</div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY">Constant Field Values</a></dd></dl>
+</li>
+</ul>
+<a name="THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT</h4>
+<pre>public static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.170">THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT</a></pre>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT">Constant Field Values</a></dd></dl>
+</li>
+</ul>
 <a name="THRIFT_QOP_KEY">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>THRIFT_QOP_KEY</h4>
-<pre>static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.173">THRIFT_QOP_KEY</a></pre>
+<pre>static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.182">THRIFT_QOP_KEY</a></pre>
 <div class="block">Thrift quality of protection configuration key. Valid values can be:
  auth-conf: authentication, integrity and confidentiality checking
  auth-int: authentication and integrity checking
@@ -554,7 +588,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>BACKLOG_CONF_KEY</h4>
-<pre>static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.174">BACKLOG_CONF_KEY</a></pre>
+<pre>static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.183">BACKLOG_CONF_KEY</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.BACKLOG_CONF_KEY">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -564,7 +598,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_BIND_ADDR</h4>
-<pre>private static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.176">DEFAULT_BIND_ADDR</a></pre>
+<pre>private static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.185">DEFAULT_BIND_ADDR</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.DEFAULT_BIND_ADDR">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -574,7 +608,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_LISTEN_PORT</h4>
-<pre>public static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.177">DEFAULT_LISTEN_PORT</a></pre>
+<pre>public static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.186">DEFAULT_LISTEN_PORT</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.DEFAULT_LISTEN_PORT">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -584,7 +618,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>HREGION_VERSION</h4>
-<pre>public static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.178">HREGION_VERSION</a></pre>
+<pre>public static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.187">HREGION_VERSION</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.HREGION_VERSION">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -594,7 +628,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>THRIFT_SUPPORT_PROXYUSER</h4>
-<pre>static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.179">THRIFT_SUPPORT_PROXYUSER</a></pre>
+<pre>static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.188">THRIFT_SUPPORT_PROXYUSER</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.THRIFT_SUPPORT_PROXYUSER">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -604,7 +638,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>listenPort</h4>
-<pre>private final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.180">listenPort</a></pre>
+<pre>private final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.189">listenPort</a></pre>
 </li>
 </ul>
 <a name="conf">
@@ -613,7 +647,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>conf</h4>
-<pre>private&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.182">conf</a></pre>
+<pre>private&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.191">conf</a></pre>
 </li>
 </ul>
 <a name="tserver">
@@ -622,7 +656,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>tserver</h4>
-<pre>volatile&nbsp;org.apache.thrift.server.TServer <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.183">tserver</a></pre>
+<pre>volatile&nbsp;org.apache.thrift.server.TServer <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.192">tserver</a></pre>
 </li>
 </ul>
 <a name="httpServer">
@@ -631,7 +665,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>httpServer</h4>
-<pre>volatile&nbsp;org.mortbay.jetty.Server <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.184">httpServer</a></pre>
+<pre>volatile&nbsp;org.mortbay.jetty.Server <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.193">httpServer</a></pre>
 </li>
 </ul>
 <a name="handler">
@@ -640,7 +674,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>handler</h4>
-<pre>private final&nbsp;org.apache.hadoop.hbase.thrift.generated.Hbase.Iface <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.185">handler</a></pre>
+<pre>private final&nbsp;org.apache.hadoop.hbase.thrift.generated.Hbase.Iface <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.194">handler</a></pre>
 </li>
 </ul>
 <a name="metrics">
@@ -649,7 +683,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>metrics</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.html" title="class in org.apache.hadoop.hbase.thrift">ThriftMetrics</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.186">metrics</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.html" title="class in org.apache.hadoop.hbase.thrift">ThriftMetrics</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.195">metrics</a></pre>
 </li>
 </ul>
 <a name="hbaseHandler">
@@ -658,7 +692,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>hbaseHandler</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner.HBaseHandler</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.187">hbaseHandler</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner.HBaseHandler</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.196">hbaseHandler</a></pre>
 </li>
 </ul>
 <a name="realUser">
@@ -667,7 +701,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>realUser</h4>
-<pre>private final&nbsp;org.apache.hadoop.security.UserGroupInformation <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.188">realUser</a></pre>
+<pre>private final&nbsp;org.apache.hadoop.security.UserGroupInformation <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.197">realUser</a></pre>
 </li>
 </ul>
 <a name="qop">
@@ -676,7 +710,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>qop</h4>
-<pre>private final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.190">qop</a></pre>
+<pre>private final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.199">qop</a></pre>
 </li>
 </ul>
 <a name="host">
@@ -685,7 +719,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>host</h4>
-<pre>private&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.191">host</a></pre>
+<pre>private&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.200">host</a></pre>
 </li>
 </ul>
 <a name="securityEnabled">
@@ -694,7 +728,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>securityEnabled</h4>
-<pre>private final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.193">securityEnabled</a></pre>
+<pre>private final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.202">securityEnabled</a></pre>
 </li>
 </ul>
 <a name="doAsEnabled">
@@ -703,7 +737,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>doAsEnabled</h4>
-<pre>private final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.194">doAsEnabled</a></pre>
+<pre>private final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.203">doAsEnabled</a></pre>
 </li>
 </ul>
 </li>
@@ -720,7 +754,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ThriftServerRunner</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.294">ThriftServerRunner</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.303">ThriftServerRunner</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
                    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>
 <dd><code><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></code></dd></dl>
@@ -740,7 +774,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.333">run</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.342">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>
@@ -753,7 +787,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>shutdown</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.357">shutdown</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.366">shutdown</a>()</pre>
 </li>
 </ul>
 <a name="setupHTTPServer()">
@@ -762,7 +796,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>setupHTTPServer</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.373">setupHTTPServer</a>()
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.382">setupHTTPServer</a>()
                       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>
 <dd><code><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></code></dd></dl>
@@ -774,7 +808,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>setupServer</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.432">setupServer</a>()
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.441">setupServer</a>()
                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Setting up the thrift TServer</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -787,7 +821,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>createExecutor</h4>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.599">createExecutor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">BlockingQueue</a>&lt;<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>&gt;&nbsp;callQueue,
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.610">createExecutor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">BlockingQueue</a>&lt;<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>&gt;&nbsp;callQueue,
                              int&nbsp;minWorkers,
                              int&nbsp;maxWorkers)</pre>
 </li>
@@ -798,7 +832,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>getBindAddress</h4>
-<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.608">getBindAddress</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.619">getBindAddress</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/net/UnknownHostException.html?is-external=true" title="class or interface in java.net">UnknownHostException</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/net/UnknownHostException.html?is-external=true" title="class or interface in java.net">UnknownHostException</a></code></dd></dl>
@@ -810,7 +844,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockList">
 <li class="blockList">
 <h4>addAttributes</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1838">addAttributes</a>(<a href="../../../../../org/apache/hadoop/hbase/client/OperationWithAttributes.html" title="class in org.apache.hadoop.hbase.client">OperationWithAttributes</a>&nbsp;op,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1849">addAttributes</a>(<a href="../../../../../org/apache/hadoop/hbase/client/OperationWithAttributes.html" title="class in org.apache.hadoop.hbase.client">OperationWithAttributes</a>&nbsp;op,
                  <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)</pre>
 <div class="block">Adds all the attributes into the Operation object</div>
 </li>
@@ -821,7 +855,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>registerFilters</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1850">registerFilters</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1861">registerFilters</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2dc53cb9/devapidocs/org/apache/hadoop/hbase/thrift2/ThriftServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift2/ThriftServer.html b/devapidocs/org/apache/hadoop/hbase/thrift2/ThriftServer.html
index 2683ce0..73c817c 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift2/ThriftServer.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift2/ThriftServer.html
@@ -141,11 +141,26 @@ implements org.apache.hadoop.util.Tool</pre>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift2/ThriftServer.html#log">log</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private static <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></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift2/ThriftServer.html#READ_TIMEOUT_OPTION">READ_TIMEOUT_OPTION</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>(package private) static <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></code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift2/ThriftServer.html#THRIFT_QOP_KEY">THRIFT_QOP_KEY</a></strong></code>
 <div class="block">Thrift quality of protection configuration key.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift2/ThriftServer.html#THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT">THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift2/ThriftServer.html#THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY">THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY</a></strong></code>
+<div class="block">Amount of time in milliseconds before a server thread will timeout
+ waiting for client to send data on a connected socket.</div>
+</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -214,12 +229,13 @@ implements org.apache.hadoop.util.Tool</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private static org.apache.thrift.server.TServer</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift2/ThriftServer.html#getTThreadPoolServer(org.apache.thrift.protocol.TProtocolFactory,%20org.apache.thrift.TProcessor,%20org.apache.thrift.transport.TTransportFactory,%20int,%20java.net.InetSocketAddress,%20int)">getTThreadPoolServer</a></strong>(org.apache.thrift.protocol.TProtocolFactory&nbsp;protocolFactory,
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/thrift2/ThriftServer.html#getTThreadPoolServer(org.apache.thrift.protocol.TProtocolFactory,%20org.apache.thrift.TProcessor,%20org.apache.thrift.transport.TTransportFactory,%20int,%20java.net.InetSocketAddress,%20int,%20int)">getTThreadPoolServer</a></strong>(org.apache.thrift.protocol.TProtocolFactory&nbsp;protocolFactory,
                                         org.apache.thrift.TProcessor&nbsp;processor,
                                         org.apache.thrift.transport.TTransportFactory&nbsp;transportFactory,
                                         int&nbsp;workerThreads,
                                         <a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetSocketAddress.html?is-external=true" title="class or interface in java.net">InetSocketAddress</a>&nbsp;inetSocketAddress,
-                                        int&nbsp;backlog)</code>&nbsp;</td>
+                                        int&nbsp;backlog,
+                                        int&nbsp;clientTimeout)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private static org.apache.thrift.transport.TTransportFactory</code></td>
@@ -330,13 +346,46 @@ implements org.apache.hadoop.util.Tool</pre>
 <a name="DEFAULT_LISTEN_PORT">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_LISTEN_PORT</h4>
 <pre>public static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.113">DEFAULT_LISTEN_PORT</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift2.ThriftServer.DEFAULT_LISTEN_PORT">Constant Field Values</a></dd></dl>
 </li>
 </ul>
+<a name="READ_TIMEOUT_OPTION">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>READ_TIMEOUT_OPTION</h4>
+<pre>private static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.115">READ_TIMEOUT_OPTION</a></pre>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift2.ThriftServer.READ_TIMEOUT_OPTION">Constant Field Values</a></dd></dl>
+</li>
+</ul>
+<a name="THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY</h4>
+<pre>public static final&nbsp;<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> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.122">THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY</a></pre>
+<div class="block">Amount of time in milliseconds before a server thread will timeout
+ waiting for client to send data on a connected socket. Currently,
+ applies only to TBoundedThreadPoolServer</div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift2.ThriftServer.THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY">Constant Field Values</a></dd></dl>
+</li>
+</ul>
+<a name="THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT</h4>
+<pre>public static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.124">THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT</a></pre>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift2.ThriftServer.THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT">Constant Field Values</a></dd></dl>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -351,7 +400,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ThriftServer</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.116">ThriftServer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.126">ThriftServer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -368,7 +417,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>printUsage</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.119">printUsage</a>()</pre>
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.129">printUsage</a>()</pre>
 </li>
 </ul>
 <a name="getOptions()">
@@ -377,7 +426,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOptions</h4>
-<pre>private static&nbsp;org.apache.commons.cli.Options&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.128">getOptions</a>()</pre>
+<pre>private static&nbsp;org.apache.commons.cli.Options&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.138">getOptions</a>()</pre>
 </li>
 </ul>
 <a name="parseArguments(org.apache.hadoop.conf.Configuration, org.apache.commons.cli.Options, java.lang.String[])">
@@ -386,7 +435,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>parseArguments</h4>
-<pre>private static&nbsp;org.apache.commons.cli.CommandLine&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.148">parseArguments</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>private static&nbsp;org.apache.commons.cli.CommandLine&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.161">parseArguments</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                                 org.apache.commons.cli.Options&nbsp;options,
                                                 <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;args)
                                                           throws org.apache.commons.cli.ParseException,
@@ -402,7 +451,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTProtocolFactory</h4>
-<pre>private static&nbsp;org.apache.thrift.protocol.TProtocolFactory&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.154">getTProtocolFactory</a>(boolean&nbsp;isCompact)</pre>
+<pre>private static&nbsp;org.apache.thrift.protocol.TProtocolFactory&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.167">getTProtocolFactory</a>(boolean&nbsp;isCompact)</pre>
 </li>
 </ul>
 <a name="getTTransportFactory(org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection, java.lang.String, java.lang.String, boolean, int)">
@@ -411,7 +460,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTTransportFactory</h4>
-<pre>private static&nbsp;org.apache.thrift.transport.TTransportFactory&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.164">getTTransportFactory</a>(<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security">SaslUtil.QualityOfProtection</a>&nbsp;qop,
+<pre>private static&nbsp;org.apache.thrift.transport.TTransportFactory&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.177">getTTransportFactory</a>(<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security">SaslUtil.QualityOfProtection</a>&nbsp;qop,
                                                                  <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,
                                                                  <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;host,
                                                                  boolean&nbsp;framed,
@@ -424,7 +473,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>bindToPort</h4>
-<pre>private static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetSocketAddress.html?is-external=true" title="class or interface in java.net">InetSocketAddress</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.215">bindToPort</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;bindValue,
+<pre>private static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetSocketAddress.html?is-external=true" title="class or interface in java.net">InetSocketAddress</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.228">bindToPort</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;bindValue,
                            int&nbsp;listenPort)
                                      throws <a href="http://docs.oracle.com/javase/7/docs/api/java/net/UnknownHostException.html?is-external=true" title="class or interface in java.net">UnknownHostException</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -437,7 +486,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTNonBlockingServer</h4>
-<pre>private static&nbsp;org.apache.thrift.server.TServer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.228">getTNonBlockingServer</a>(org.apache.thrift.protocol.TProtocolFactory&nbsp;protocolFactory,
+<pre>private static&nbsp;org.apache.thrift.server.TServer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.241">getTNonBlockingServer</a>(org.apache.thrift.protocol.TProtocolFactory&nbsp;protocolFactory,
                                                      org.apache.thrift.TProcessor&nbsp;processor,
                                                      org.apache.thrift.transport.TTransportFactory&nbsp;transportFactory,
                                                      <a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetSocketAddress.html?is-external=true" title="class or interface in java.net">InetSocketAddress</a>&nbsp;inetSocketAddress)
@@ -452,7 +501,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTHsHaServer</h4>
-<pre>private static&nbsp;org.apache.thrift.server.TServer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.239">getTHsHaServer</a>(org.apache.thrift.protocol.TProtocolFactory&nbsp;protocolFactory,
+<pre>private static&nbsp;org.apache.thrift.server.TServer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.252">getTHsHaServer</a>(org.apache.thrift.protocol.TProtocolFactory&nbsp;protocolFactory,
                                               org.apache.thrift.TProcessor&nbsp;processor,
                                               org.apache.thrift.transport.TTransportFactory&nbsp;transportFactory,
                                               int&nbsp;workerThreads,
@@ -469,22 +518,23 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createExecutor</h4>
-<pre>private static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.260">createExecutor</a>(int&nbsp;workerThreads,
+<pre>private static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.273">createExecutor</a>(int&nbsp;workerThreads,
                              <a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.html" title="class in org.apache.hadoop.hbase.thrift">ThriftMetrics</a>&nbsp;metrics)</pre>
 </li>
 </ul>
-<a name="getTThreadPoolServer(org.apache.thrift.protocol.TProtocolFactory, org.apache.thrift.TProcessor, org.apache.thrift.transport.TTransportFactory, int, java.net.InetSocketAddress, int)">
+<a name="getTThreadPoolServer(org.apache.thrift.protocol.TProtocolFactory, org.apache.thrift.TProcessor, org.apache.thrift.transport.TTransportFactory, int, java.net.InetSocketAddress, int, int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTThreadPoolServer</h4>
-<pre>private static&nbsp;org.apache.thrift.server.TServer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.273">getTThreadPoolServer</a>(org.apache.thrift.protocol.TProtocolFactory&nbsp;protocolFactory,
+<pre>private static&nbsp;org.apache.thrift.server.TServer&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.286">getTThreadPoolServer</a>(org.apache.thrift.protocol.TProtocolFactory&nbsp;protocolFactory,
                                                     org.apache.thrift.TProcessor&nbsp;processor,
                                                     org.apache.thrift.transport.TTransportFactory&nbsp;transportFactory,
                                                     int&nbsp;workerThreads,
                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetSocketAddress.html?is-external=true" title="class or interface in java.net">InetSocketAddress</a>&nbsp;inetSocketAddress,
-                                                    int&nbsp;backlog)
+                                                    int&nbsp;backlog,
+                                                    int&nbsp;clientTimeout)
                                                               throws org.apache.thrift.transport.TTransportException</pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code>org.apache.thrift.transport.TTransportException</code></dd></dl>
@@ -496,7 +546,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>registerFilters</h4>
-<pre>protected static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.299">registerFilters</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>protected static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.314">registerFilters</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block">Adds the option to pre-load filters at startup.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>conf</code> - The current configuration instance.</dd></dl>
 </li>
@@ -507,7 +557,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.316">main</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;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.331">main</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;args)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Start up the Thrift2 server.</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -520,7 +570,7 @@ implements org.apache.hadoop.util.Tool</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.324">run</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;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html#line.339">run</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;args)
         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><strong>Specified by:</strong></dt>