http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html
index b97945c..206f7c7 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":9,"i4":9,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":9,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -175,6 +175,11 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
                   long&nbsp;sizeLimit,
                   <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" 
title="enum in 
org.apache.hadoop.hbase.quotas">SpaceViolationPolicy</a>&nbsp;violationPolicy)</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#SpaceLimitSettings-org.apache.hadoop.hbase.TableName-java.lang.String-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest-">SpaceLimitSettings</a></span>(<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.SpaceLimitRequest&nbsp;req)</code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -199,43 +204,56 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>private 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#buildProtoFromQuota-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota-">buildProtoFromQuota</a></span>(org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota&nbsp;protoQuota)</code>
+<div class="block">Build a <code>QuotaProtos.SpaceLimitRequest</code> protobuf 
object from the given <code>QuotaProtos.SpaceQuota</code>.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>private 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#buildProtoRemoveQuota--">buildProtoRemoveQuota</a></span>()</code>
 <div class="block">Builds a <code>QuotaProtos.SpaceQuota</code> protobuf 
object to remove a quota.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#equals-java.lang.Object-">equals</a></span>(<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>&nbsp;o)</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>(package private) static <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">SpaceLimitSettings</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#fromSpaceQuota-java.lang.String-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota-">fromSpaceQuota</a></span>(<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;proto)</code>
 <div class="block">Constructs a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas"><code>SpaceLimitSettings</code></a> from the 
provided protobuf message and namespace.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>(package private) static <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">SpaceLimitSettings</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#fromSpaceQuota-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota-">fromSpaceQuota</a></span>(<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.SpaceQuota&nbsp;proto)</code>
 <div class="block">Constructs a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas"><code>SpaceLimitSettings</code></a> from the 
provided protobuf message and tablename.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>(package private) 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#getProto--">getProto</a></span>()</code>
 <div class="block">Returns a copy of the internal state of 
<code>this</code></div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" 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/SpaceLimitSettings.html#getQuotaType--">getQuotaType</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>protected <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/SpaceLimitSettings.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="i10" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.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()
@@ -243,11 +261,11 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
  properties.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i11" 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/SpaceLimitSettings.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>(package private) static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#validateProtoArguments-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota-">validateProtoArguments</a></span>(org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota&nbsp;proto)</code>
 <div class="block">Validates that the provided protobuf SpaceQuota has the 
necessary information to construct
@@ -260,7 +278,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">
@@ -335,13 +353,24 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <a name="SpaceLimitSettings-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>SpaceLimitSettings</h4>
 <pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.66">SpaceLimitSettings</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">Constructs a <code>SpaceLimitSettings</code> to remove a 
space quota on the given <code>namespace</code>.</div>
 </li>
 </ul>
+<a 
name="SpaceLimitSettings-org.apache.hadoop.hbase.TableName-java.lang.String-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>SpaceLimitSettings</h4>
+<pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.71">SpaceLimitSettings</a>(<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.SpaceLimitRequest&nbsp;req)</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
@@ -350,13 +379,29 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a 
name="buildProtoFromQuota-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>buildProtoFromQuota</h4>
+<pre>private&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.82">buildProtoFromQuota</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota&nbsp;protoQuota)</pre>
+<div class="block">Build a <code>QuotaProtos.SpaceLimitRequest</code> protobuf 
object from the given <code>QuotaProtos.SpaceQuota</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>protoQuota</code> - The preconstructed SpaceQuota protobuf</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A protobuf request to change a space limit quota</dd>
+</dl>
+</li>
+</ul>
 <a 
name="buildProtoAddQuota-long-org.apache.hadoop.hbase.quotas.SpaceViolationPolicy-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>buildProtoAddQuota</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.78">buildProtoAddQuota</a>(long&nbsp;sizeLimit,
+<pre>private&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.93">buildProtoAddQuota</a>(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">Builds a <code>QuotaProtos.SpaceQuota</code> protobuf 
object given the arguments.</div>
 <dl>
@@ -374,7 +419,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>buildProtoRemoveQuota</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.93">buildProtoRemoveQuota</a>()</pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.106">buildProtoRemoveQuota</a>()</pre>
 <div class="block">Builds a <code>QuotaProtos.SpaceQuota</code> protobuf 
object to remove a quota.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -388,7 +433,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>getProto</h4>
-<pre>org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.104">getProto</a>()</pre>
+<pre>org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceLimitRequest&nbsp;<a
 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.117">getProto</a>()</pre>
 <div class="block">Returns a copy of the internal state of 
<code>this</code></div>
 </li>
 </ul>
@@ -398,7 +443,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/SpaceLimitSettings.html#line.109">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/SpaceLimitSettings.html#line.122">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>
@@ -411,7 +456,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/SpaceLimitSettings.html#line.114">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/SpaceLimitSettings.html#line.127">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
@@ -428,7 +473,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>fromSpaceQuota</h4>
-<pre>static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">SpaceLimitSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.126">fromSpaceQuota</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="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">SpaceLimitSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.139">fromSpaceQuota</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.SpaceQuota&nbsp;proto)</pre>
 <div class="block">Constructs a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas"><code>SpaceLimitSettings</code></a> from the 
provided protobuf message and tablename.</div>
 <dl>
@@ -446,7 +491,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>fromSpaceQuota</h4>
-<pre>static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">SpaceLimitSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.140">fromSpaceQuota</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="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">SpaceLimitSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.153">fromSpaceQuota</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.SpaceQuota&nbsp;proto)</pre>
 <div class="block">Constructs a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas"><code>SpaceLimitSettings</code></a> from the 
provided protobuf message and namespace.</div>
 <dl>
@@ -464,7 +509,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>validateProtoArguments</h4>
-<pre>static&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.153">validateProtoArguments</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota&nbsp;proto)</pre>
+<pre>static&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.166">validateProtoArguments</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceQuota&nbsp;proto)</pre>
 <div class="block">Validates that the provided protobuf SpaceQuota has the 
necessary information to construct
  a <a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas"><code>SpaceLimitSettings</code></a>.</div>
 <dl>
@@ -479,7 +524,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>hashCode</h4>
-<pre>public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.163">hashCode</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.176">hashCode</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#hashCode--";
 title="class or interface in java.lang">hashCode</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>
@@ -492,7 +537,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>equals</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.168">equals</a>(<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>&nbsp;o)</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.181">equals</a>(<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>&nbsp;o)</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#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</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>
@@ -502,16 +547,36 @@ 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/SpaceLimitSettings.html#line.183">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/SpaceLimitSettings.html#line.196">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="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/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceLimitSettings.html#line.215">merge</a>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in 
org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;newSettings)</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>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html
index a579d1e..e274efc 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html
@@ -273,7 +273,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" 
title="enum in 
org.apache.hadoop.hbase.quotas">SpaceViolationPolicy</a>[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html#line.28">values</a>()</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" 
title="enum in 
org.apache.hadoop.hbase.quotas">SpaceViolationPolicy</a>[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html#line.45">values</a>()</pre>
 <div class="block">Returns an array containing the constants of this enum 
type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
@@ -293,7 +293,7 @@ for (SpaceViolationPolicy c : SpaceViolationPolicy.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" 
title="enum in org.apache.hadoop.hbase.quotas">SpaceViolationPolicy</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html#line.28">valueOf</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;name)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" 
title="enum in org.apache.hadoop.hbase.quotas">SpaceViolationPolicy</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html#line.45">valueOf</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;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified 
name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6bd0774/devapidocs/org/apache/hadoop/hbase/quotas/ThrottleSettings.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/ThrottleSettings.html 
b/devapidocs/org/apache/hadoop/hbase/quotas/ThrottleSettings.html
index 6121418..a998437 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/ThrottleSettings.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/ThrottleSettings.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var methods = 
{"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -116,7 +116,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>@InterfaceAudience.Private
  @InterfaceStability.Evolving
-class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.31">ThrottleSettings</a>
+class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.34">ThrottleSettings</a>
 extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a></pre>
 </li>
 </ul>
@@ -137,7 +137,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.ThrottleRequest</code></td>
+<td class="colFirst"><code>(package private) 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.ThrottleRequest</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html#proto">proto</a></span></code>&nbsp;</td>
 </tr>
 </table>
@@ -200,6 +200,13 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html#getTimeUnit--">getTimeUnit</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">ThrottleSettings</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.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;other)</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="i6" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.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()
@@ -207,17 +214,21 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
  properties.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" 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/ThrottleSettings.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html#validateTimedQuota-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota-">validateTimedQuota</a></span>(org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota&nbsp;timedQuota)</code>&nbsp;</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a 
name="methods.inherited.from.class.org.apache.hadoop.hbase.quotas.QuotaSettings">
 <!--   -->
 </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">
@@ -246,7 +257,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockListLast">
 <li class="blockList">
 <h4>proto</h4>
-<pre>private 
final&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.ThrottleRequest
 <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.32">proto</a></pre>
+<pre>final&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.ThrottleRequest
 <a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.35">proto</a></pre>
 </li>
 </ul>
 </li>
@@ -263,7 +274,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ThrottleSettings</h4>
-<pre><a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.34">ThrottleSettings</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/ThrottleSettings.html#line.37">ThrottleSettings</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.ThrottleRequest&nbsp;proto)</pre>
@@ -283,7 +294,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>getThrottleType</h4>
-<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.40">getThrottleType</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" 
title="enum in org.apache.hadoop.hbase.quotas">ThrottleType</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.43">getThrottleType</a>()</pre>
 </li>
 </ul>
 <a name="getSoftLimit--">
@@ -292,7 +303,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>getSoftLimit</h4>
-<pre>public&nbsp;long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.44">getSoftLimit</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.47">getSoftLimit</a>()</pre>
 </li>
 </ul>
 <a name="getTimeUnit--">
@@ -301,7 +312,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>getTimeUnit</h4>
-<pre>public&nbsp;<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;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.48">getTimeUnit</a>()</pre>
+<pre>public&nbsp;<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;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.51">getTimeUnit</a>()</pre>
 </li>
 </ul>
 <a name="getQuotaType--">
@@ -310,7 +321,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/ThrottleSettings.html#line.54">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/ThrottleSettings.html#line.57">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>
@@ -323,7 +334,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/ThrottleSettings.html#line.59">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/ThrottleSettings.html#line.62">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
@@ -340,20 +351,57 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.htm
 <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/ThrottleSettings.html#line.64">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/ThrottleSettings.html#line.67">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="merge-org.apache.hadoop.hbase.quotas.QuotaSettings-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>merge</h4>
+<pre>protected&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">ThrottleSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.106">merge</a>(<a
 href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a>&nbsp;other)
+                          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>other</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="validateTimedQuota-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>validateTimedQuota</h4>
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.140">validateTimedQuota</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota&nbsp;timedQuota)
+                         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>
+<dl>
+<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="fromTimedQuota-java.lang.String-org.apache.hadoop.hbase.TableName-java.lang.String-org.apache.hadoop.hbase.quotas.ThrottleType-org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.TimedQuota-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>fromTimedQuota</h4>
-<pre>static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">ThrottleSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.102">fromTimedQuota</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="../../../../../org/apache/hadoop/hbase/quotas/ThrottleSettings.html" 
title="class in org.apache.hadoop.hbase.quotas">ThrottleSettings</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/quotas/ThrottleSettings.html#line.147">fromTimedQuota</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,

Reply via email to