http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettings.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettings.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettings.html
index 7086ada..b1999f4 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettings.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettings.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = 
{"i0":9,"i1":10,"i2":6,"i3":10,"i4":10,"i5":10,"i6":6,"i7":9,"i8":9};
+var methods = 
{"i0":9,"i1":9,"i2":10,"i3":6,"i4":10,"i5":10,"i6":6,"i7":10,"i8":6,"i9":9,"i10":9,"i11":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -109,12 +109,12 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html"
 title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettingsFactory.QuotaGlobalsSettingsBypass</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">SpaceLimitSettings</a>, <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">ThrottleSettings</a></dd>
+<dd><a 
href="../../../../../org/apache/hadoop/hbase/quotas/GlobalQuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">GlobalQuotaSettings</a>, <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html"
 title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettingsFactory.QuotaGlobalsSettingsBypass</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">SpaceLimitSettings</a>, <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">ThrottleSettings</a></dd>
 </dl>
 <hr>
 <br>
 <pre>@InterfaceAudience.Public
-public abstract class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.28">QuotaSettings</a>
+public abstract class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.33">QuotaSettings</a>
 extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -183,32 +183,45 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#buildFromProto-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest-">buildFromProto</a></span>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest&nbsp;request)</code>
+<div class="block">Converts the protocol buffer request into a QuotaSetting 
POJO.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>static 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#buildSetQuotaRequestProto-org.apache.hadoop.hbase.quotas.QuotaSettings-">buildSetQuotaRequestProto</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;settings)</code>
 <div class="block">Convert a QuotaSettings to a protocol buffer 
SetQuotaRequest.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getNamespace--">getNamespace</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>abstract <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum 
in org.apache.hadoop.hbase.quotas">QuotaType</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getQuotaType--">getQuotaType</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getTableName--">getTableName</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getUserName--">getUserName</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>(package private) abstract <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#merge-org.apache.hadoop.hbase.quotas.QuotaSettings-">merge</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;newSettings)</code>
+<div class="block">Merges the provided settings with <code>this</code> and 
returns a new settings
+ object to the caller if the merged settings differ from the original.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#ownerToString--">ownerToString</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#setupSetQuotaRequest-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder-">setupSetQuotaRequest</a></span>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder&nbsp;builder)</code>
 <div class="block">Called by toSetQuotaRequestProto()
@@ -216,14 +229,20 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  properties.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>protected static <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#sizeToString-long-">sizeToString</a></span>(long&nbsp;size)</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>protected static <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#timeToString-java.util.concurrent.TimeUnit-">timeToString</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;timeUnit)</code>&nbsp;</td>
 </tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>(package private) void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#validateQuotaTarget-org.apache.hadoop.hbase.quotas.QuotaSettings-">validateQuotaTarget</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;mergee)</code>
+<div class="block">Validates that settings being merged into <code>this</code> 
is targeting the same "subject", e.g.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -252,7 +271,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>userName</h4>
-<pre>private final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.29">userName</a></pre>
+<pre>private final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.34">userName</a></pre>
 </li>
 </ul>
 <a name="namespace">
@@ -261,7 +280,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>namespace</h4>
-<pre>private final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.30">namespace</a></pre>
+<pre>private final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.35">namespace</a></pre>
 </li>
 </ul>
 <a name="tableName">
@@ -270,7 +289,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>tableName</h4>
-<pre>private final&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.31">tableName</a></pre>
+<pre>private final&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.36">tableName</a></pre>
 </li>
 </ul>
 </li>
@@ -287,7 +306,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>QuotaSettings</h4>
-<pre>protected&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.33">QuotaSettings</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>protected&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.38">QuotaSettings</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                         <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                         <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace)</pre>
 </li>
@@ -306,7 +325,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getQuotaType</h4>
-<pre>public abstract&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum 
in org.apache.hadoop.hbase.quotas">QuotaType</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.40">getQuotaType</a>()</pre>
+<pre>public abstract&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum 
in org.apache.hadoop.hbase.quotas">QuotaType</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.45">getQuotaType</a>()</pre>
 </li>
 </ul>
 <a name="getUserName--">
@@ -315,7 +334,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getUserName</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.42">getUserName</a>()</pre>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.47">getUserName</a>()</pre>
 </li>
 </ul>
 <a name="getTableName--">
@@ -324,7 +343,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getTableName</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.46">getTableName</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.51">getTableName</a>()</pre>
 </li>
 </ul>
 <a name="getNamespace--">
@@ -333,7 +352,26 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getNamespace</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.50">getNamespace</a>()</pre>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.55">getNamespace</a>()</pre>
+</li>
+</ul>
+<a 
name="buildFromProto-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>buildFromProto</h4>
+<pre>@InterfaceAudience.Private
+public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.68">buildFromProto</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest&nbsp;request)</pre>
+<div class="block">Converts the protocol buffer request into a QuotaSetting 
POJO. Arbitrarily
+ enforces that the request only contain one "limit", despite the message
+ allowing multiple. The public API does not allow such use of the 
message.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>request</code> - The protocol buffer request.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas"><code>QuotaSettings</code></a> 
POJO.</dd>
+</dl>
 </li>
 </ul>
 <a 
name="buildSetQuotaRequestProto-org.apache.hadoop.hbase.quotas.QuotaSettings-">
@@ -343,7 +381,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <li class="blockList">
 <h4>buildSetQuotaRequestProto</h4>
 <pre>@InterfaceAudience.Private
-public 
static&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.60">buildSetQuotaRequestProto</a>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;settings)</pre>
+public 
static&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.115">buildSetQuotaRequestProto</a>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;settings)</pre>
 <div class="block">Convert a QuotaSettings to a protocol buffer 
SetQuotaRequest.
  This is used internally by the Admin client to serialize the quota settings
  and send them to the master.</div>
@@ -356,7 +394,7 @@ public 
static&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProto
 <li class="blockList">
 <h4>setupSetQuotaRequest</h4>
 <pre>@InterfaceAudience.Private
-protected abstract&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.81">setupSetQuotaRequest</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder&nbsp;builder)</pre>
+protected abstract&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.136">setupSetQuotaRequest</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder&nbsp;builder)</pre>
 <div class="block">Called by toSetQuotaRequestProto()
  the subclass should implement this method to set the specific SetQuotaRequest
  properties.</div>
@@ -368,7 +406,7 @@ protected abstract&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/ha
 <ul class="blockList">
 <li class="blockList">
 <h4>ownerToString</h4>
-<pre>protected&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.83">ownerToString</a>()</pre>
+<pre>protected&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.138">ownerToString</a>()</pre>
 </li>
 </ul>
 <a name="sizeToString-long-">
@@ -377,16 +415,53 @@ protected abstract&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/ha
 <ul class="blockList">
 <li class="blockList">
 <h4>sizeToString</h4>
-<pre>protected static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.103">sizeToString</a>(long&nbsp;size)</pre>
+<pre>protected static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.158">sizeToString</a>(long&nbsp;size)</pre>
 </li>
 </ul>
 <a name="timeToString-java.util.concurrent.TimeUnit-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>timeToString</h4>
-<pre>protected static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.112">timeToString</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;timeUnit)</pre>
+<pre>protected static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.167">timeToString</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;timeUnit)</pre>
+</li>
+</ul>
+<a name="merge-org.apache.hadoop.hbase.quotas.QuotaSettings-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>merge</h4>
+<pre>abstract&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.187">merge</a>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;newSettings)
+                      throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
+<div class="block">Merges the provided settings with <code>this</code> and 
returns a new settings
+ object to the caller if the merged settings differ from the original.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>newSettings</code> - The new settings to merge in.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The merged <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas"><code>QuotaSettings</code></a> 
object or null if the quota should be deleted.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="validateQuotaTarget-org.apache.hadoop.hbase.quotas.QuotaSettings-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>validateQuotaTarget</h4>
+<pre>void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html#line.196">validateQuotaTarget</a>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;mergee)</pre>
+<div class="block">Validates that settings being merged into <code>this</code> 
is targeting the same "subject", e.g.
+ user, table, namespace.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mergee</code> - The quota settings to be merged into 
<code>this</code>.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true";
 title="class or interface in java.lang">IllegalArgumentException</a></code> - 
if the subjects are not equal.</dd>
+</dl>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html
 
b/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html
index 72a489b..b2005c6 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>static class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.34">QuotaSettingsFactory.QuotaGlobalsSettingsBypass</a>
+<pre>static class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.36">QuotaSettingsFactory.QuotaGlobalsSettingsBypass</a>
 extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a></pre>
 </li>
 </ul>
@@ -178,10 +178,21 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>protected boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#getBypass--">getBypass</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum 
in org.apache.hadoop.hbase.quotas">QuotaType</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#getQuotaType--">getQuotaType</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html"
 title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettingsFactory.QuotaGlobalsSettingsBypass</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#merge-org.apache.hadoop.hbase.quotas.QuotaSettings-">merge</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;newSettings)</code>
+<div class="block">Merges the provided settings with <code>this</code> and 
returns a new settings
+ object to the caller if the merged settings differ from the original.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#setupSetQuotaRequest-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder-">setupSetQuotaRequest</a></span>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder&nbsp;builder)</code>
 <div class="block">Called by toSetQuotaRequestProto()
@@ -189,7 +200,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
  properties.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
@@ -199,7 +210,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.quotas.<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a></h3>
-<code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#buildSetQuotaRequestProto-org.apache.hadoop.hbase.quotas.QuotaSettings-">buildSetQuotaRequestProto</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getNamespace--">getNamespace</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getTableName--">getTableName</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getUserName--">getUserName</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#ownerToString--">ownerToString</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#sizeToString-long-">sizeToString</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#timeToString-java.util.concurrent.TimeUnit-">timeToString</a></code></li>
+<code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#buildFromProto-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest-">buildFromProto</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#buildSetQuotaRequestProto-org.apache.hadoop.hbase.quotas.QuotaSettings-">buildSetQuotaRequestProto</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getNamespace--">getNamespace</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getTableName--">getTableName</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getUserName--">getUserName</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#ownerToString--">ownerToString</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#sizeToString-long-">sizeToString</a>,
 <a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#timeT
 oString-java.util.concurrent.TimeUnit-">timeToString</a>, <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#validateQuotaTarget-org.apache.hadoop.hbase.quotas.QuotaSettings-">validateQuotaTarget</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -228,7 +239,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockListLast">
 <li class="blockList">
 <h4>bypassGlobals</h4>
-<pre>private final&nbsp;boolean <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.35">bypassGlobals</a></pre>
+<pre>private final&nbsp;boolean <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.37">bypassGlobals</a></pre>
 </li>
 </ul>
 </li>
@@ -245,7 +256,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockListLast">
 <li class="blockList">
 <h4>QuotaGlobalsSettingsBypass</h4>
-<pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.37">QuotaGlobalsSettingsBypass</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.39">QuotaGlobalsSettingsBypass</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                            <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                            <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                            boolean&nbsp;bypassGlobals)</pre>
@@ -265,7 +276,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>getQuotaType</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum 
in org.apache.hadoop.hbase.quotas">QuotaType</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.44">getQuotaType</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum 
in org.apache.hadoop.hbase.quotas">QuotaType</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.46">getQuotaType</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#getQuotaType--">getQuotaType</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a></code></dd>
@@ -278,7 +289,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>setupSetQuotaRequest</h4>
-<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.49">setupSetQuotaRequest</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder&nbsp;builder)</pre>
+<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.51">setupSetQuotaRequest</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder&nbsp;builder)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#setupSetQuotaRequest-org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest.Builder-">QuotaSettings</a></code></span></div>
 <div class="block">Called by toSetQuotaRequestProto()
  the subclass should implement this method to set the specific SetQuotaRequest
@@ -292,16 +303,48 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <a name="toString--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.54">toString</a>()</pre>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.56">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a></code>&nbsp;in 
class&nbsp;<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></code></dd>
 </dl>
 </li>
 </ul>
+<a name="getBypass--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getBypass</h4>
+<pre>protected&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.60">getBypass</a>()</pre>
+</li>
+</ul>
+<a name="merge-org.apache.hadoop.hbase.quotas.QuotaSettings-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>merge</h4>
+<pre>protected&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html"
 title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettingsFactory.QuotaGlobalsSettingsBypass</a>&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.QuotaGlobalsSettingsBypass.html#line.65">merge</a>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;newSettings)
+                                                         throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#merge-org.apache.hadoop.hbase.quotas.QuotaSettings-">QuotaSettings</a></code></span></div>
+<div class="block">Merges the provided settings with <code>this</code> and 
returns a new settings
+ object to the caller if the merged settings differ from the original.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html#merge-org.apache.hadoop.hbase.quotas.QuotaSettings-">merge</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>newSettings</code> - The new settings to merge in.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The merged <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas"><code>QuotaSettings</code></a> 
object or null if the quota should be deleted.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
index 17bd3b4..8b0ba79 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Public
-public class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.33">QuotaSettingsFactory</a>
+public class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.35">QuotaSettingsFactory</a>
 extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -368,7 +368,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>QuotaSettingsFactory</h4>
-<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.33">QuotaSettingsFactory</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.35">QuotaSettingsFactory</a>()</pre>
 </li>
 </ul>
 </li>
@@ -385,7 +385,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromUserQuotas</h4>
-<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.62">fromUserQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.82">fromUserQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                           
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas&nbsp;quotas)</pre>
 </li>
 </ul>
@@ -395,7 +395,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromUserQuotas</h4>
-<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.66">fromUserQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.86">fromUserQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                           <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                           
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas&nbsp;quotas)</pre>
 </li>
@@ -406,7 +406,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromUserQuotas</h4>
-<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.71">fromUserQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.91">fromUserQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                           <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                           
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas&nbsp;quotas)</pre>
 </li>
@@ -417,7 +417,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromTableQuotas</h4>
-<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.76">fromTableQuotas</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.96">fromTableQuotas</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                            
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas&nbsp;quotas)</pre>
 </li>
 </ul>
@@ -427,7 +427,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromNamespaceQuotas</h4>
-<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.80">fromNamespaceQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
+<pre>static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.100">fromNamespaceQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                                
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas&nbsp;quotas)</pre>
 </li>
 </ul>
@@ -437,7 +437,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromQuotas</h4>
-<pre>private static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.84">fromQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>private static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.104">fromQuotas</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                               <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                               
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas&nbsp;quotas)</pre>
@@ -449,7 +449,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromThrottle</h4>
-<pre>private static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.99">fromThrottle</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>private static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&gt;&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.119">fromThrottle</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                                 <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                                 <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                                 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Throttle&nbsp;throttle)</pre>
@@ -461,7 +461,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>fromSpace</h4>
-<pre>static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.129">fromSpace</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;table,
+<pre>static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.149">fromSpace</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;table,
                                <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota&nbsp;protoQuota)</pre>
 </li>
@@ -472,7 +472,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>throttleUser</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.155">throttleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.184">throttleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                          <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a>&nbsp;type,
                                          long&nbsp;limit,
                                          <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;timeUnit)</pre>
@@ -494,7 +494,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>throttleUser</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.170">throttleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.199">throttleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                          <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                          <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a>&nbsp;type,
                                          long&nbsp;limit,
@@ -518,7 +518,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>throttleUser</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.185">throttleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.214">throttleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                          <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                          <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a>&nbsp;type,
                                          long&nbsp;limit,
@@ -542,7 +542,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>unthrottleUser</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.196">unthrottleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.225">unthrottleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName)</pre>
 <div class="block">Remove the throttling for the specified user.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -558,7 +558,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>unthrottleUser</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.207">unthrottleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.236">unthrottleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                            <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
 <div class="block">Remove the throttling for the specified user on the 
specified table.</div>
 <dl>
@@ -576,7 +576,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>unthrottleUser</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.218">unthrottleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.247">unthrottleUser</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                            <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace)</pre>
 <div class="block">Remove the throttling for the specified user on the 
specified namespace.</div>
 <dl>
@@ -594,7 +594,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>throttleTable</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.231">throttleTable</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.260">throttleTable</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                           <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a>&nbsp;type,
                                           long&nbsp;limit,
                                           <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;timeUnit)</pre>
@@ -616,7 +616,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>unthrottleTable</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.242">unthrottleTable</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.271">unthrottleTable</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
 <div class="block">Remove the throttling for the specified table.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -632,7 +632,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>throttleNamespace</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.255">throttleNamespace</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.284">throttleNamespace</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                               <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a>&nbsp;type,
                                               long&nbsp;limit,
                                               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/TimeUnit.html?is-external=true";
 title="class or interface in 
java.util.concurrent">TimeUnit</a>&nbsp;timeUnit)</pre>
@@ -654,7 +654,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>unthrottleNamespace</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.266">unthrottleNamespace</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.295">unthrottleNamespace</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace)</pre>
 <div class="block">Remove the throttling for the specified namespace.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -670,7 +670,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>throttle</h4>
-<pre>private static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.271">throttle</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>private static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.300">throttle</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                       <a 
href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                       <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                       <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a>&nbsp;type,
@@ -684,7 +684,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>bypassGlobals</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.295">bypassGlobals</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.324">bypassGlobals</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;userName,
                                           boolean&nbsp;bypassGlobals)</pre>
 <div class="block">Set the "bypass global settings" for the specified 
user</div>
 <dl>
@@ -702,7 +702,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>limitTableSpace</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.313">limitTableSpace</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.342">limitTableSpace</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                             long&nbsp;sizeLimit,
                                             <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" 
title="enum in 
org.apache.hadoop.hbase.quotas">SpaceViolationPolicy</a>&nbsp;violationPolicy)</pre>
 <div class="block">Creates a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas"><code>QuotaSettings</code></a> 
object to limit the FileSystem space usage for the given table
@@ -724,7 +724,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>removeTableSpaceLimit</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.325">removeTableSpaceLimit</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.354">removeTableSpaceLimit</a>(<a
 href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in 
org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
 <div class="block">Creates a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas"><code>QuotaSettings</code></a> 
object to remove the FileSystem space quota for the given
  table.</div>
 <dl>
@@ -741,7 +741,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>limitNamespaceSpace</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.339">limitNamespaceSpace</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.368">limitNamespaceSpace</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                                                 long&nbsp;sizeLimit,
                                                 <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" 
title="enum in 
org.apache.hadoop.hbase.quotas">SpaceViolationPolicy</a>&nbsp;violationPolicy)</pre>
 <div class="block">Creates a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas"><code>QuotaSettings</code></a> 
object to limit the FileSystem space usage for the given
@@ -763,7 +763,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>removeNamespaceSpaceLimit</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.351">removeNamespaceSpaceLimit</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html#line.380">removeNamespaceSpaceLimit</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace)</pre>
 <div class="block">Creates a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas"><code>QuotaSettings</code></a> 
object to remove the FileSystem space quota for the given
  namespace.</div>
 <dl>

Reply via email to