http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/quotas/class-use/ThrottlingException.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/quotas/class-use/ThrottlingException.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/class-use/ThrottlingException.html
index 24baa0b..e842bff 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/quotas/class-use/ThrottlingException.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/quotas/class-use/ThrottlingException.html
@@ -103,93 +103,47 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">DefaultOperationQuota.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html#checkQuota-int-int-int-">checkQuota</a></span>(int&nbsp;numWrites,
-          int&nbsp;numReads,
-          int&nbsp;numScans)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">OperationQuota.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.html#checkQuota-int-int-int-">checkQuota</a></span>(int&nbsp;numWrites,
-          int&nbsp;numReads,
-          int&nbsp;numScans)</code>
-<div class="block">Checks if it is possible to execute the specified 
operation.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">NoopOperationQuota.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/NoopOperationQuota.html#checkQuota-int-int-int-">checkQuota</a></span>(int&nbsp;numWrites,
-          int&nbsp;numReads,
-          int&nbsp;numScans)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">TimeBasedLimiter.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/TimeBasedLimiter.html#checkQuota-long-long-">checkQuota</a></span>(long&nbsp;writeSize,
-          long&nbsp;readSize)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">QuotaLimiter.</span><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/QuotaLimiter.html#checkQuota-long-long-">checkQuota</a></span>(long&nbsp;estimateWriteSize,
-          long&nbsp;estimateReadSize)</code>
-<div class="block">Checks if it is possible to execute the specified 
operation.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">NoopQuotaLimiter.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html#checkQuota-long-long-">checkQuota</a></span>(long&nbsp;estimateWriteSize,
-          long&nbsp;estimateReadSize)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.html" 
title="interface in 
org.apache.hadoop.hbase.quotas">OperationQuota</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerRpcQuotaManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.html#checkQuota-org.apache.hadoop.hbase.regionserver.Region-int-int-int-">checkQuota</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;region,
-          int&nbsp;numWrites,
-          int&nbsp;numReads,
-          int&nbsp;numScans)</code>
-<div class="block">Check the quota for the current (rpc-context) user.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.html" 
title="interface in 
org.apache.hadoop.hbase.quotas">OperationQuota</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerRpcQuotaManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.html#checkQuota-org.apache.hadoop.hbase.regionserver.Region-java.util.List-">checkQuota</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;region,
-          <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.Action&gt;&nbsp;actions)</code>
-<div class="block">Check the quota for the current (rpc-context) user.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.html" 
title="interface in 
org.apache.hadoop.hbase.quotas">OperationQuota</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">RegionServerRpcQuotaManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.html#checkQuota-org.apache.hadoop.hbase.regionserver.Region-org.apache.hadoop.hbase.quotas.OperationQuota.OperationType-">checkQuota</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;region,
-          <a 
href="../../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html"
 title="enum in 
org.apache.hadoop.hbase.quotas">OperationQuota.OperationType</a>&nbsp;type)</code>
-<div class="block">Check the quota for the current (rpc-context) user.</div>
-</td>
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwNumReadRequestsExceeded-long-">throwNumReadRequestsExceeded</a></span>(long&nbsp;waitInterval)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwNumReadRequestsExceeded-long-">throwNumReadRequestsExceeded</a></span>(long&nbsp;waitInterval)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwNumRequestsExceeded-long-">throwNumRequestsExceeded</a></span>(long&nbsp;waitInterval)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwNumRequestsExceeded-long-">throwNumRequestsExceeded</a></span>(long&nbsp;waitInterval)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwNumWriteRequestsExceeded-long-">throwNumWriteRequestsExceeded</a></span>(long&nbsp;waitInterval)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwNumWriteRequestsExceeded-long-">throwNumWriteRequestsExceeded</a></span>(long&nbsp;waitInterval)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwReadSizeExceeded-long-">throwReadSizeExceeded</a></span>(long&nbsp;waitInterval)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwReadSizeExceeded-long-">throwReadSizeExceeded</a></span>(long&nbsp;waitInterval)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwRequestSizeExceeded-long-">throwRequestSizeExceeded</a></span>(long&nbsp;waitInterval)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwRequestSizeExceeded-long-">throwRequestSizeExceeded</a></span>(long&nbsp;waitInterval)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>private static void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwThrottlingException-org.apache.hadoop.hbase.quotas.ThrottlingException.Type-long-">throwThrottlingException</a></span>(<a
 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html"
 title="enum in 
org.apache.hadoop.hbase.quotas">ThrottlingException.Type</a>&nbsp;type,
-                        long&nbsp;waitInterval)</code>&nbsp;</td>
+                        long&nbsp;waitInterval)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwWriteSizeExceeded-long-">throwWriteSizeExceeded</a></span>(long&nbsp;waitInterval)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ThrottlingException.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html#throwWriteSizeExceeded-long-">throwWriteSizeExceeded</a></span>(long&nbsp;waitInterval)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/quotas/package-frame.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-frame.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/package-frame.html
index 9fcb45b..e15595d 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-frame.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-frame.html
@@ -89,6 +89,7 @@
 <li><a href="OperationQuota.OperationType.html" title="enum in 
org.apache.hadoop.hbase.quotas" 
target="classFrame">OperationQuota.OperationType</a></li>
 <li><a href="QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas" 
target="classFrame">QuotaScope</a></li>
 <li><a href="QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas" 
target="classFrame">QuotaType</a></li>
+<li><a href="RpcThrottlingException.Type.html" title="enum in 
org.apache.hadoop.hbase.quotas" 
target="classFrame">RpcThrottlingException.Type</a></li>
 <li><a href="SpaceViolationPolicy.html" title="enum in 
org.apache.hadoop.hbase.quotas" 
target="classFrame">SpaceViolationPolicy</a></li>
 <li><a href="ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas" 
target="classFrame">ThrottleType</a></li>
 <li><a href="ThrottlingException.Type.html" title="enum in 
org.apache.hadoop.hbase.quotas" 
target="classFrame">ThrottlingException.Type</a></li>
@@ -97,6 +98,7 @@
 <ul title="Exceptions">
 <li><a 
href="FileArchiverNotifierImpl.QuotaSnapshotSizeSerializationException.html" 
title="class in org.apache.hadoop.hbase.quotas" 
target="classFrame">FileArchiverNotifierImpl.QuotaSnapshotSizeSerializationException</a></li>
 <li><a href="QuotaExceededException.html" title="class in 
org.apache.hadoop.hbase.quotas" 
target="classFrame">QuotaExceededException</a></li>
+<li><a href="RpcThrottlingException.html" title="class in 
org.apache.hadoop.hbase.quotas" 
target="classFrame">RpcThrottlingException</a></li>
 <li><a href="SpaceLimitingException.html" title="class in 
org.apache.hadoop.hbase.quotas" 
target="classFrame">SpaceLimitingException</a></li>
 <li><a href="ThrottlingException.html" title="class in 
org.apache.hadoop.hbase.quotas" target="classFrame">ThrottlingException</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/quotas/package-summary.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-summary.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/package-summary.html
index d6d3cc1..f6308f3 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-summary.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-summary.html
@@ -507,18 +507,22 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html"
 title="enum in 
org.apache.hadoop.hbase.quotas">RpcThrottlingException.Type</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" 
title="enum in org.apache.hadoop.hbase.quotas">SpaceViolationPolicy</a></td>
 <td class="colLast">
 <div class="block">Enumeration that represents the action HBase will take when 
a space quota is violated.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a></td>
 <td class="colLast">
 <div class="block">Describe the Throttle Type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html"
 title="enum in 
org.apache.hadoop.hbase.quotas">ThrottlingException.Type</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -546,15 +550,21 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.html"
 title="class in org.apache.hadoop.hbase.quotas">RpcThrottlingException</a></td>
+<td class="colLast">
+<div class="block">Describe the throttling result.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitingException.html"
 title="class in org.apache.hadoop.hbase.quotas">SpaceLimitingException</a></td>
 <td class="colLast">
 <div class="block">An Exception that is thrown when a space quota is in 
violation.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.html" 
title="class in org.apache.hadoop.hbase.quotas">ThrottlingException</a></td>
-<td class="colLast">
-<div class="block">Describe the throttling result.</div>
+<td class="colLast">Deprecated
+<div class="block"><span class="deprecationComment">replaced by <a 
href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.html"
 title="class in 
org.apache.hadoop.hbase.quotas"><code>RpcThrottlingException</code></a> since 
hbase-2.0.0.</span></div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index 65a2ef4..4b5274d 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -171,6 +171,7 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.html"
 title="class in org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">RpcThrottlingException</span></a></li>
 </ul>
 </li>
 </ul>
@@ -228,11 +229,12 @@
 <ul>
 <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.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.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/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">ThrottleType</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/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/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/RpcThrottlingException.Type.html"
 title="enum in org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">RpcThrottlingException.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html"
 title="enum in org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">OperationQuota.OperationType</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/quotas/package-use.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-use.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/package-use.html
index 6dde91a..fd2ed5c 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-use.html
@@ -437,6 +437,14 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/class-use/RpcThrottlingException.html#org.apache.hadoop.hbase.quotas">RpcThrottlingException</a>
+<div class="block">Describe the throttling result.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/class-use/RpcThrottlingException.Type.html#org.apache.hadoop.hbase.quotas">RpcThrottlingException.Type</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/class-use/SpaceLimitingException.html#org.apache.hadoop.hbase.quotas">SpaceLimitingException</a>
 <div class="block">An Exception that is thrown when a space quota is in 
violation.</div>
 </td>
@@ -498,11 +506,15 @@
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/class-use/ThrottlingException.html#org.apache.hadoop.hbase.quotas">ThrottlingException</a>
-<div class="block">Describe the throttling result.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">replaced by <a 
href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.html"
 title="class in 
org.apache.hadoop.hbase.quotas"><code>RpcThrottlingException</code></a> since 
hbase-2.0.0.</span></div>
+</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/class-use/ThrottlingException.Type.html#org.apache.hadoop.hbase.quotas">ThrottlingException.Type</a>&nbsp;</td>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/class-use/ThrottlingException.Type.html#org.apache.hadoop.hbase.quotas">ThrottlingException.Type</a>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/class-use/TimeBasedLimiter.html#org.apache.hadoop.hbase.quotas">TimeBasedLimiter</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index c6caf11..8a9d4c2 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -704,20 +704,20 @@
 <ul>
 <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.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">Region.Operation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" 
title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">FlushType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TimeRangeTracker.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" 
title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">FlushType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScannerContext.NextState</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.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">Region.Operation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" 
title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScanType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TimeRangeTracker.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" 
title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScanType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
index 858ccf6..b377318 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -130,9 +130,9 @@
 <ul>
 <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.regionserver.querymatcher.<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html"
 title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html"
 title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html"
 title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html"
 title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index 5a7e325..d9fa142 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -137,9 +137,9 @@
 <ul>
 <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.security.access.<a 
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html"
 title="enum in org.apache.hadoop.hbase.security.access"><span 
class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a 
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html"
 title="enum in org.apache.hadoop.hbase.security.access"><span 
class="typeNameLink">AccessController.OpType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a 
href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html"
 title="enum in org.apache.hadoop.hbase.security.access"><span 
class="typeNameLink">Permission.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a 
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html"
 title="enum in org.apache.hadoop.hbase.security.access"><span 
class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index 8e41b8e..41c2191 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -198,9 +198,9 @@
 <ul>
 <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.thrift.<a 
href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html"
 title="enum in org.apache.hadoop.hbase.thrift"><span 
class="typeNameLink">ThriftServerRunner.ImplType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a 
href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html"
 title="enum in org.apache.hadoop.hbase.thrift"><span 
class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a 
href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html"
 title="enum in org.apache.hadoop.hbase.thrift"><span 
class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a 
href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html"
 title="enum in org.apache.hadoop.hbase.thrift"><span 
class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a 
href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html"
 title="enum in org.apache.hadoop.hbase.thrift"><span 
class="typeNameLink">ThriftServerRunner.ImplType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index debc4a7..90aa9ce 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -532,14 +532,14 @@
 <ul>
 <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/PrettyPrinter.Unit.html" 
title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">PrettyPrinter.Unit</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html"
 title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">IdReadWriteLock.ReferenceType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" 
title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">ChecksumType</span></a></li>
-<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.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html"
 title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html"
 title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a>
 (implements org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" 
title="interface in 
org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" 
title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">PoolMap.PoolType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" 
title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">PrettyPrinter.Unit</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html"
 title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a>
 (implements org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" 
title="interface in 
org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html"
 title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a 
href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" 
title="enum in org.apache.hadoop.hbase.util"><span 
class="typeNameLink">PoolMap.PoolType</span></a></li>
+<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>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/overview-tree.html b/devapidocs/overview-tree.html
index 9c4a44f..5e84ab8 100644
--- a/devapidocs/overview-tree.html
+++ b/devapidocs/overview-tree.html
@@ -3903,6 +3903,7 @@
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/RegionOfflineException.html" title="class 
in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RegionOfflineException</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a 
href="org/apache/hadoop/hbase/quotas/RpcThrottlingException.html" title="class 
in org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">RpcThrottlingException</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.procedure.<a 
href="org/apache/hadoop/hbase/master/procedure/ServerCrashException.html" 
title="class in org.apache.hadoop.hbase.master.procedure"><span 
class="typeNameLink">ServerCrashException</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/ServiceNotRunningException.html" title="class in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">ServiceNotRunningException</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a 
href="org/apache/hadoop/hbase/ipc/StoppedRpcClientException.html" title="class 
in org.apache.hadoop.hbase.ipc"><span 
class="typeNameLink">StoppedRpcClientException</span></a></li>
@@ -5182,6 +5183,7 @@
 <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.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/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/RpcThrottlingException.Type.html" 
title="enum in org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">RpcThrottlingException.Type</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/SpaceViolationPolicy.html" title="enum in 
org.apache.hadoop.hbase.quotas"><span 
class="typeNameLink">SpaceViolationPolicy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">Coprocessor.State</span></a></li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/serialized-form.html
----------------------------------------------------------------------
diff --git a/devapidocs/serialized-form.html b/devapidocs/serialized-form.html
index fd1c018..d29bc1a 100644
--- a/devapidocs/serialized-form.html
+++ b/devapidocs/serialized-form.html
@@ -1383,6 +1383,26 @@
 </a>
 <h3>Class <a href="org/apache/hadoop/hbase/quotas/QuotaExceededException.html" 
title="class in 
org.apache.hadoop.hbase.quotas">org.apache.hadoop.hbase.quotas.QuotaExceededException</a>
 extends <a href="org/apache/hadoop/hbase/DoNotRetryIOException.html" 
title="class in org.apache.hadoop.hbase">DoNotRetryIOException</a> implements 
Serializable</h3>
 </li>
+<li class="blockList"><a 
name="org.apache.hadoop.hbase.quotas.RpcThrottlingException">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/hadoop/hbase/quotas/RpcThrottlingException.html" 
title="class in 
org.apache.hadoop.hbase.quotas">org.apache.hadoop.hbase.quotas.RpcThrottlingException</a>
 extends <a href="org/apache/hadoop/hbase/HBaseIOException.html" title="class 
in org.apache.hadoop.hbase">HBaseIOException</a> implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialized Fields</h3>
+<ul class="blockList">
+<li class="blockList">
+<h4>waitInterval</h4>
+<pre>long waitInterval</pre>
+</li>
+<li class="blockListLast">
+<h4>type</h4>
+<pre><a href="org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" 
title="enum in org.apache.hadoop.hbase.quotas">RpcThrottlingException.Type</a> 
type</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a 
name="org.apache.hadoop.hbase.quotas.SpaceLimitingException">
 <!--   -->
 </a>
@@ -1418,10 +1438,12 @@
 <li class="blockList">
 <h4>waitInterval</h4>
 <pre>long waitInterval</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </li>
 <li class="blockListLast">
 <h4>type</h4>
 <pre><a href="org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottlingException.Type</a> 
type</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index bb27134..da85657 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
 <span class="sourceLineNo">008</span>@InterfaceAudience.Private<a 
name="line.8"></a>
 <span class="sourceLineNo">009</span>public class Version {<a 
name="line.9"></a>
 <span class="sourceLineNo">010</span>  public static final String version = 
"3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span>  public static final String revision = 
"773aff90fdf9edf4687b373d1c7ba859d166a437";<a name="line.11"></a>
+<span class="sourceLineNo">011</span>  public static final String revision = 
"42d5447cfbc593becfc26684e03f482eb3a0fc49";<a name="line.11"></a>
 <span class="sourceLineNo">012</span>  public static final String user = 
"jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span>  public static final String date = "Mon 
Apr 16 14:39:11 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span>  public static final String date = "Tue 
Apr 17 14:39:15 UTC 2018";<a name="line.13"></a>
 <span class="sourceLineNo">014</span>  public static final String url = 
"git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a
 name="line.14"></a>
-<span class="sourceLineNo">015</span>  public static final String srcChecksum 
= "83e5500271237f8b8d44991e5fb13ecd";<a name="line.15"></a>
+<span class="sourceLineNo">015</span>  public static final String srcChecksum 
= "7216e99e4e2f243f8ca1e9d09be1a120";<a name="line.15"></a>
 <span class="sourceLineNo">016</span>}<a name="line.16"></a>
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/exceptions/ClientExceptionsUtil.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/exceptions/ClientExceptionsUtil.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/exceptions/ClientExceptionsUtil.html
index 5895455..412e95e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/exceptions/ClientExceptionsUtil.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/exceptions/ClientExceptionsUtil.html
@@ -47,7 +47,7 @@
 <span class="sourceLineNo">039</span>import 
org.apache.yetus.audience.InterfaceStability;<a name="line.39"></a>
 <span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.ipc.CallTimeoutException;<a name="line.40"></a>
 <span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.ipc.FailedServerException;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.quotas.ThrottlingException;<a name="line.42"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.quotas.RpcThrottlingException;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.ipc.RemoteException;<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
 <span class="sourceLineNo">045</span>@InterfaceAudience.Private<a 
name="line.45"></a>
@@ -68,7 +68,7 @@
 <span class="sourceLineNo">060</span><a name="line.60"></a>
 <span class="sourceLineNo">061</span>  public static boolean 
isSpecialException(Throwable cur) {<a name="line.61"></a>
 <span class="sourceLineNo">062</span>    return (cur instanceof 
RegionMovedException || cur instanceof RegionOpeningException<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>        || cur instanceof 
RegionTooBusyException || cur instanceof ThrottlingException<a 
name="line.63"></a>
+<span class="sourceLineNo">063</span>        || cur instanceof 
RegionTooBusyException || cur instanceof RpcThrottlingException<a 
name="line.63"></a>
 <span class="sourceLineNo">064</span>        || cur instanceof 
MultiActionResultTooLarge || cur instanceof RetryImmediatelyException<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span>        || cur instanceof 
CallQueueTooBigException || cur instanceof CallDroppedException<a 
name="line.65"></a>
 <span class="sourceLineNo">066</span>        || cur instanceof 
NotServingRegionException || cur instanceof RequestTooBigException);<a 
name="line.66"></a>
@@ -81,7 +81,7 @@
 <span class="sourceLineNo">073</span>   * - nested exceptions<a 
name="line.73"></a>
 <span class="sourceLineNo">074</span>   *<a name="line.74"></a>
 <span class="sourceLineNo">075</span>   * Looks for: RegionMovedException / 
RegionOpeningException / RegionTooBusyException /<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   *            ThrottlingException<a 
name="line.76"></a>
+<span class="sourceLineNo">076</span>   *            RpcThrottlingException<a 
name="line.76"></a>
 <span class="sourceLineNo">077</span>   * @return null if we didn't find the 
exception, the exception otherwise.<a name="line.77"></a>
 <span class="sourceLineNo">078</span>   */<a name="line.78"></a>
 <span class="sourceLineNo">079</span>  public static Throwable 
findException(Object exception) {<a name="line.79"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html
index a70ec7a..a9abfb0 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html
@@ -67,7 +67,7 @@
 <span class="sourceLineNo">059</span><a name="line.59"></a>
 <span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
 <span class="sourceLineNo">061</span>  public void checkQuota(int numWrites, 
int numReads, int numScans)<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      throws ThrottlingException {<a 
name="line.62"></a>
+<span class="sourceLineNo">062</span>      throws RpcThrottlingException {<a 
name="line.62"></a>
 <span class="sourceLineNo">063</span>    writeConsumed = 
estimateConsume(OperationType.MUTATE, numWrites, 100);<a name="line.63"></a>
 <span class="sourceLineNo">064</span>    readConsumed  = 
estimateConsume(OperationType.GET, numReads, 100);<a name="line.64"></a>
 <span class="sourceLineNo">065</span>    readConsumed += 
estimateConsume(OperationType.SCAN, numScans, 1000);<a name="line.65"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopOperationQuota.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopOperationQuota.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopOperationQuota.html
index 34334d2..f04e7d4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopOperationQuota.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopOperationQuota.html
@@ -51,7 +51,7 @@
 <span class="sourceLineNo">043</span><a name="line.43"></a>
 <span class="sourceLineNo">044</span>  @Override<a name="line.44"></a>
 <span class="sourceLineNo">045</span>  public void checkQuota(int numWrites, 
int numReads, int numScans)<a name="line.45"></a>
-<span class="sourceLineNo">046</span>      throws ThrottlingException {<a 
name="line.46"></a>
+<span class="sourceLineNo">046</span>      throws RpcThrottlingException {<a 
name="line.46"></a>
 <span class="sourceLineNo">047</span>    // no-op<a name="line.47"></a>
 <span class="sourceLineNo">048</span>  }<a name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html
index a461337..b7a8227 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html
@@ -44,7 +44,7 @@
 <span class="sourceLineNo">036</span><a name="line.36"></a>
 <span class="sourceLineNo">037</span>  @Override<a name="line.37"></a>
 <span class="sourceLineNo">038</span>  public void checkQuota(long 
estimateWriteSize, long estimateReadSize)<a name="line.38"></a>
-<span class="sourceLineNo">039</span>      throws ThrottlingException {<a 
name="line.39"></a>
+<span class="sourceLineNo">039</span>      throws RpcThrottlingException {<a 
name="line.39"></a>
 <span class="sourceLineNo">040</span>    // no-op<a name="line.40"></a>
 <span class="sourceLineNo">041</span>  }<a name="line.41"></a>
 <span class="sourceLineNo">042</span><a name="line.42"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html
index 71eeff0..7aaa8a6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html
@@ -49,38 +49,39 @@
 <span class="sourceLineNo">041</span>   * @param numWrites number of write 
operation that will be performed<a name="line.41"></a>
 <span class="sourceLineNo">042</span>   * @param numReads number of small-read 
operation that will be performed<a name="line.42"></a>
 <span class="sourceLineNo">043</span>   * @param numScans number of long-read 
operation that will be performed<a name="line.43"></a>
-<span class="sourceLineNo">044</span>   * @throws ThrottlingException if the 
operation cannot be performed<a name="line.44"></a>
-<span class="sourceLineNo">045</span>   */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  void checkQuota(int numWrites, int 
numReads, int numScans)<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    throws ThrottlingException;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  /** Cleanup method on operation 
completion */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>  void close();<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  /**<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   * Add a get result. This will be used 
to calculate the exact quota and<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   * have a better short-read average 
size for the next time.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  void addGetResult(Result result);<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  /**<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   * Add a scan result. This will be used 
to calculate the exact quota and<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   * have a better long-read average size 
for the next time.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  void addScanResult(List&lt;Result&gt; 
results);<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * Add a mutation result. This will be 
used to calculate the exact quota and<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   * have a better mutation average size 
for the next time.<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   */<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  void addMutation(Mutation mutation);<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  /** @return the number of bytes 
available to read to avoid exceeding the quota */<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  long getReadAvailable();<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  /** @return the number of bytes 
available to write to avoid exceeding the quota */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  long getWriteAvailable();<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>}<a name="line.75"></a>
+<span class="sourceLineNo">044</span>   * @throws RpcThrottlingException if 
the operation cannot be performed because<a name="line.44"></a>
+<span class="sourceLineNo">045</span>   *   RPC quota is exceeded.<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>   */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  void checkQuota(int numWrites, int 
numReads, int numScans)<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    throws RpcThrottlingException;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  /** Cleanup method on operation 
completion */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  void close();<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  /**<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * Add a get result. This will be used 
to calculate the exact quota and<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * have a better short-read average 
size for the next time.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  void addGetResult(Result result);<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  /**<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   * Add a scan result. This will be used 
to calculate the exact quota and<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   * have a better long-read average size 
for the next time.<a name="line.61"></a>
+<span class="sourceLineNo">062</span>   */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  void addScanResult(List&lt;Result&gt; 
results);<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * Add a mutation result. This will be 
used to calculate the exact quota and<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * have a better mutation average size 
for the next time.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  void addMutation(Mutation mutation);<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  /** @return the number of bytes 
available to read to avoid exceeding the quota */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  long getReadAvailable();<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  /** @return the number of bytes 
available to write to avoid exceeding the quota */<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  long getWriteAvailable();<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>}<a name="line.76"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.html
index 71eeff0..7aaa8a6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/OperationQuota.html
@@ -49,38 +49,39 @@
 <span class="sourceLineNo">041</span>   * @param numWrites number of write 
operation that will be performed<a name="line.41"></a>
 <span class="sourceLineNo">042</span>   * @param numReads number of small-read 
operation that will be performed<a name="line.42"></a>
 <span class="sourceLineNo">043</span>   * @param numScans number of long-read 
operation that will be performed<a name="line.43"></a>
-<span class="sourceLineNo">044</span>   * @throws ThrottlingException if the 
operation cannot be performed<a name="line.44"></a>
-<span class="sourceLineNo">045</span>   */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  void checkQuota(int numWrites, int 
numReads, int numScans)<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    throws ThrottlingException;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  /** Cleanup method on operation 
completion */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>  void close();<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  /**<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   * Add a get result. This will be used 
to calculate the exact quota and<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   * have a better short-read average 
size for the next time.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  void addGetResult(Result result);<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  /**<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   * Add a scan result. This will be used 
to calculate the exact quota and<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   * have a better long-read average size 
for the next time.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  void addScanResult(List&lt;Result&gt; 
results);<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * Add a mutation result. This will be 
used to calculate the exact quota and<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   * have a better mutation average size 
for the next time.<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   */<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  void addMutation(Mutation mutation);<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  /** @return the number of bytes 
available to read to avoid exceeding the quota */<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  long getReadAvailable();<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  /** @return the number of bytes 
available to write to avoid exceeding the quota */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  long getWriteAvailable();<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>}<a name="line.75"></a>
+<span class="sourceLineNo">044</span>   * @throws RpcThrottlingException if 
the operation cannot be performed because<a name="line.44"></a>
+<span class="sourceLineNo">045</span>   *   RPC quota is exceeded.<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>   */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  void checkQuota(int numWrites, int 
numReads, int numScans)<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    throws RpcThrottlingException;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  /** Cleanup method on operation 
completion */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  void close();<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  /**<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * Add a get result. This will be used 
to calculate the exact quota and<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * have a better short-read average 
size for the next time.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  void addGetResult(Result result);<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  /**<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   * Add a scan result. This will be used 
to calculate the exact quota and<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   * have a better long-read average size 
for the next time.<a name="line.61"></a>
+<span class="sourceLineNo">062</span>   */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  void addScanResult(List&lt;Result&gt; 
results);<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * Add a mutation result. This will be 
used to calculate the exact quota and<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * have a better mutation average size 
for the next time.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  void addMutation(Mutation mutation);<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  /** @return the number of bytes 
available to read to avoid exceeding the quota */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  long getReadAvailable();<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  /** @return the number of bytes 
available to write to avoid exceeding the quota */<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  long getWriteAvailable();<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>}<a name="line.76"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html
index 622995f..80bd305 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html
@@ -41,10 +41,10 @@
 <span class="sourceLineNo">033</span>   *<a name="line.33"></a>
 <span class="sourceLineNo">034</span>   * @param estimateWriteSize the write 
size that will be checked against the available quota<a name="line.34"></a>
 <span class="sourceLineNo">035</span>   * @param estimateReadSize the read 
size that will be checked against the available quota<a name="line.35"></a>
-<span class="sourceLineNo">036</span>   * @throws ThrottlingException thrown 
if not enough avialable resources to perform operation.<a name="line.36"></a>
+<span class="sourceLineNo">036</span>   * @throws RpcThrottlingException 
thrown if not enough avialable resources to perform operation.<a 
name="line.36"></a>
 <span class="sourceLineNo">037</span>   */<a name="line.37"></a>
 <span class="sourceLineNo">038</span>  void checkQuota(long estimateWriteSize, 
long estimateReadSize)<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    throws ThrottlingException;<a 
name="line.39"></a>
+<span class="sourceLineNo">039</span>    throws RpcThrottlingException;<a 
name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
 <span class="sourceLineNo">041</span>  /**<a name="line.41"></a>
 <span class="sourceLineNo">042</span>   * Removes the specified write and read 
amount from the quota.<a name="line.42"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.html
index 5f2a433..0864582 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/RegionServerRpcQuotaManager.html
@@ -135,10 +135,10 @@
 <span class="sourceLineNo">127</span>   * @param region the region where the 
operation will be performed<a name="line.127"></a>
 <span class="sourceLineNo">128</span>   * @param type the operation type<a 
name="line.128"></a>
 <span class="sourceLineNo">129</span>   * @return the OperationQuota<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>   * @throws ThrottlingException if the 
operation cannot be executed due to quota exceeded.<a name="line.130"></a>
+<span class="sourceLineNo">130</span>   * @throws RpcThrottlingException if 
the operation cannot be executed due to quota exceeded.<a name="line.130"></a>
 <span class="sourceLineNo">131</span>   */<a name="line.131"></a>
 <span class="sourceLineNo">132</span>  public OperationQuota checkQuota(final 
Region region,<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      final OperationQuota.OperationType 
type) throws IOException, ThrottlingException {<a name="line.133"></a>
+<span class="sourceLineNo">133</span>      final OperationQuota.OperationType 
type) throws IOException, RpcThrottlingException {<a name="line.133"></a>
 <span class="sourceLineNo">134</span>    switch (type) {<a name="line.134"></a>
 <span class="sourceLineNo">135</span>      case SCAN:   return 
checkQuota(region, 0, 0, 1);<a name="line.135"></a>
 <span class="sourceLineNo">136</span>      case GET:    return 
checkQuota(region, 0, 1, 0);<a name="line.136"></a>
@@ -154,10 +154,10 @@
 <span class="sourceLineNo">146</span>   * @param region the region where the 
operation will be performed<a name="line.146"></a>
 <span class="sourceLineNo">147</span>   * @param actions the "multi" actions 
to perform<a name="line.147"></a>
 <span class="sourceLineNo">148</span>   * @return the OperationQuota<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>   * @throws ThrottlingException if the 
operation cannot be executed due to quota exceeded.<a name="line.149"></a>
+<span class="sourceLineNo">149</span>   * @throws RpcThrottlingException if 
the operation cannot be executed due to quota exceeded.<a name="line.149"></a>
 <span class="sourceLineNo">150</span>   */<a name="line.150"></a>
 <span class="sourceLineNo">151</span>  public OperationQuota checkQuota(final 
Region region,<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      final 
List&lt;ClientProtos.Action&gt; actions) throws IOException, 
ThrottlingException {<a name="line.152"></a>
+<span class="sourceLineNo">152</span>      final 
List&lt;ClientProtos.Action&gt; actions) throws IOException, 
RpcThrottlingException {<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    int numWrites = 0;<a 
name="line.153"></a>
 <span class="sourceLineNo">154</span>    int numReads = 0;<a 
name="line.154"></a>
 <span class="sourceLineNo">155</span>    for (final ClientProtos.Action 
action: actions) {<a name="line.155"></a>
@@ -179,11 +179,11 @@
 <span class="sourceLineNo">171</span>   * @param numReads number of 
short-reads to perform<a name="line.171"></a>
 <span class="sourceLineNo">172</span>   * @param numScans number of scan to 
perform<a name="line.172"></a>
 <span class="sourceLineNo">173</span>   * @return the OperationQuota<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>   * @throws ThrottlingException if the 
operation cannot be executed due to quota exceeded.<a name="line.174"></a>
+<span class="sourceLineNo">174</span>   * @throws RpcThrottlingException if 
the operation cannot be executed due to quota exceeded.<a name="line.174"></a>
 <span class="sourceLineNo">175</span>   */<a name="line.175"></a>
 <span class="sourceLineNo">176</span>  private OperationQuota checkQuota(final 
Region region,<a name="line.176"></a>
 <span class="sourceLineNo">177</span>      final int numWrites, final int 
numReads, final int numScans)<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      throws IOException, 
ThrottlingException {<a name="line.178"></a>
+<span class="sourceLineNo">178</span>      throws IOException, 
RpcThrottlingException {<a name="line.178"></a>
 <span class="sourceLineNo">179</span>    Optional&lt;User&gt; user = 
RpcServer.getRequestUser();<a name="line.179"></a>
 <span class="sourceLineNo">180</span>    UserGroupInformation ugi;<a 
name="line.180"></a>
 <span class="sourceLineNo">181</span>    if (user.isPresent()) {<a 
name="line.181"></a>
@@ -196,7 +196,7 @@
 <span class="sourceLineNo">188</span>    OperationQuota quota = getQuota(ugi, 
table);<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    try {<a name="line.189"></a>
 <span class="sourceLineNo">190</span>      quota.checkQuota(numWrites, 
numReads, numScans);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    } catch (ThrottlingException e) {<a 
name="line.191"></a>
+<span class="sourceLineNo">191</span>    } catch (RpcThrottlingException e) 
{<a name="line.191"></a>
 <span class="sourceLineNo">192</span>      LOG.debug("Throttling exception for 
user=" + ugi.getUserName() +<a name="line.192"></a>
 <span class="sourceLineNo">193</span>                " table=" + table + " 
numWrites=" + numWrites +<a name="line.193"></a>
 <span class="sourceLineNo">194</span>                " numReads=" + numReads + 
" numScans=" + numScans +<a name="line.194"></a>

Reply via email to