hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [26/51] [partial] hbase-site git commit: Published site at 889d89a74c8b1ae6ce7a0f70a63073bbe7708e88.
Date Thu, 28 Apr 2016 17:14:42 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/class-use/TableNotFoundException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/TableNotFoundException.html b/devapidocs/org/apache/hadoop/hbase/class-use/TableNotFoundException.html
index f7e60ae..adb575b 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/TableNotFoundException.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/TableNotFoundException.html
@@ -194,13 +194,13 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/master/handler/DisableTableHandler.html" title="class in org.apache.hadoop.hbase.master.handler">DisableTableHandler</a></code></td>
-<td class="colLast"><span class="strong">DisableTableHandler.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/master/handler/DisableTableHandler.html#prepare()">prepare</a></strong>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/master/handler/EnableTableHandler.html" title="class in org.apache.hadoop.hbase.master.handler">EnableTableHandler</a></code></td>
 <td class="colLast"><span class="strong">EnableTableHandler.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/master/handler/EnableTableHandler.html#prepare()">prepare</a></strong>()</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/master/handler/DisableTableHandler.html" title="class in org.apache.hadoop.hbase.master.handler">DisableTableHandler</a></code></td>
+<td class="colLast"><span class="strong">DisableTableHandler.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/master/handler/DisableTableHandler.html#prepare()">prepare</a></strong>()</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/class-use/Tag.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/Tag.html b/devapidocs/org/apache/hadoop/hbase/class-use/Tag.html
index 8a4b480..2e6d3dd 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Tag.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Tag.html
@@ -146,15 +146,15 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 <td class="colLast"><span class="strong">KeyValue.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/KeyValue.html#EMPTY_ARRAY_LIST">EMPTY_ARRAY_LIST</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;</code></td>
+<td class="colLast"><span class="strong">CellUtil.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/CellUtil.html#EMPTY_TAGS_ITR">EMPTY_TAGS_ITR</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>(package private) static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;</code></td>
 <td class="colLast"><span class="strong">TagUtil.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/TagUtil.html#EMPTY_TAGS_ITR">EMPTY_TAGS_ITR</a></strong></code>
 <div class="block">Iterator returned when no Tags.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;</code></td>
-<td class="colLast"><span class="strong">CellUtil.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/CellUtil.html#EMPTY_TAGS_ITR">EMPTY_TAGS_ITR</a></strong></code>&nbsp;</td>
-</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -767,18 +767,18 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;</code></td>
-<td class="colLast"><span class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#createVisibilityExpTags(java.lang.String,%20boolean,%20boolean)">createVisibilityExpTags</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;visExpression,
-                                              boolean&nbsp;withSerializationFormat,
-                                              boolean&nbsp;checkAuths)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;</code></td>
 <td class="colLast"><span class="strong">VisibilityLabelService.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.html#createVisibilityExpTags(java.lang.String,%20boolean,%20boolean)">createVisibilityExpTags</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;visExpression,
                                               boolean&nbsp;withSerializationFormat,
                                               boolean&nbsp;checkAuths)</code>
 <div class="block">Creates tags corresponding to given visibility expression.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;</code></td>
+<td class="colLast"><span class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#createVisibilityExpTags(java.lang.String,%20boolean,%20boolean)">createVisibilityExpTags</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;visExpression,
+                                              boolean&nbsp;withSerializationFormat,
+                                              boolean&nbsp;checkAuths)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;</code></td>
 <td class="colLast"><span class="strong">VisibilityUtils.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityUtils.html#createVisibilityExpTags(java.lang.String,%20boolean,%20boolean,%20java.util.Set,%20org.apache.hadoop.hbase.security.visibility.VisibilityLabelOrdinalProvider)">createVisibilityExpTags</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;visExpression,
@@ -823,11 +823,6 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><span class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#encodeVisibilityForReplication(java.util.List,%20java.lang.Byte)">encodeVisibilityForReplication</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;tags,
-                                                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;serializationFormat)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>byte[]</code></td>
 <td class="colLast"><span class="strong">VisibilityLabelService.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.html#encodeVisibilityForReplication(java.util.List,%20java.lang.Byte)">encodeVisibilityForReplication</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;visTags,
                                                             <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;serializationFormat)</code>
 <div class="block">Provides a way to modify the visibility tags of type <a href="../../../../../org/apache/hadoop/hbase/TagType.html" title="class in org.apache.hadoop.hbase"><code>TagType</code></a>
@@ -837,6 +832,11 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
  .replicate().</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>byte[]</code></td>
+<td class="colLast"><span class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#encodeVisibilityForReplication(java.util.List,%20java.lang.Byte)">encodeVisibilityForReplication</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;tags,
+                                                            <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;serializationFormat)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a></code></td>
 <td class="colLast"><span class="strong">VisibilityUtils.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityUtils.html#extractAndPartitionTags(org.apache.hadoop.hbase.Cell,%20java.util.List,%20java.util.List)">extractAndPartitionTags</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
@@ -882,20 +882,6 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#matchVisibility(java.util.List,%20java.lang.Byte,%20java.util.List,%20java.lang.Byte)">matchVisibility</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;putVisTags,
-                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;putTagsFormat,
-                              <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;deleteVisTags,
-                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;deleteTagsFormat)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#matchVisibility(java.util.List,%20java.lang.Byte,%20java.util.List,%20java.lang.Byte)">matchVisibility</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;putVisTags,
-                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;putTagsFormat,
-                              <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;deleteVisTags,
-                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;deleteTagsFormat)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="strong">VisibilityLabelService.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.html#matchVisibility(java.util.List,%20java.lang.Byte,%20java.util.List,%20java.lang.Byte)">matchVisibility</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;putVisTags,
                               <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;putVisTagFormat,
                               <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;deleteVisTags,
@@ -915,6 +901,20 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#matchVisibility(java.util.List,%20java.lang.Byte,%20java.util.List,%20java.lang.Byte)">matchVisibility</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;putVisTags,
+                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;putTagsFormat,
+                              <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;deleteVisTags,
+                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;deleteTagsFormat)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#matchVisibility(java.util.List,%20java.lang.Byte,%20java.util.List,%20java.lang.Byte)">matchVisibility</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;putVisTags,
+                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;putTagsFormat,
+                              <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;deleteVisTags,
+                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Byte.html?is-external=true" title="class or interface in java.lang">Byte</a>&nbsp;deleteTagsFormat)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><span class="strong">VisibilityController.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityController.html#removeReplicationVisibilityTag(java.util.List)">removeReplicationVisibilityTag</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>&gt;&nbsp;tags)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/class-use/ZooKeeperConnectionException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/ZooKeeperConnectionException.html b/devapidocs/org/apache/hadoop/hbase/class-use/ZooKeeperConnectionException.html
index 8cdd0f8..adebe43 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/ZooKeeperConnectionException.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/ZooKeeperConnectionException.html
@@ -168,17 +168,17 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#isMasterRunning()">isMasterRunning</a></strong>()</code>
+<td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HConnection.html#isMasterRunning()">isMasterRunning</a></strong>()</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>this has been deprecated without a replacement</i></div>
+<div class="block"><i>internal method, do not use thru HConnection</i></div>
 </div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HConnection.html#isMasterRunning()">isMasterRunning</a></strong>()</code>
+<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#isMasterRunning()">isMasterRunning</a></strong>()</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>internal method, do not use thru HConnection</i></div>
+<div class="block"><i>this has been deprecated without a replacement</i></div>
 </div>
 </td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html b/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
index e341dc6..0f28494 100644
--- a/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
@@ -80,12 +80,12 @@
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Evolving.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Evolving</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.LimitedPrivate.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.LimitedPrivate</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Stable.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Stable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Public.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Public</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Unstable.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Unstable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Evolving.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Evolving</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Private</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Unstable.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Unstable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Public.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Public</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/classification/package-use.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/classification/package-use.html b/devapidocs/org/apache/hadoop/hbase/classification/package-use.html
index 4cbdb06..cfa4d4e 100644
--- a/devapidocs/org/apache/hadoop/hbase/classification/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/classification/package-use.html
@@ -1641,20 +1641,10 @@ service.</div>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.LimitedPrivate.html#org.apache.hadoop.hbase.mapred">InterfaceAudience.LimitedPrivate</a>
-<div class="block">Intended only for the project(s) specified in the annotation.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.Public.html#org.apache.hadoop.hbase.mapred">InterfaceAudience.Public</a>
 <div class="block">Intended for use by any project or application.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/classification/class-use/InterfaceStability.Evolving.html#org.apache.hadoop.hbase.mapred">InterfaceStability.Evolving</a>
-<div class="block">Evolving, but can break compatibility at minor release (i.e.</div>
-</td>
-</tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/classification/class-use/InterfaceStability.Stable.html#org.apache.hadoop.hbase.mapred">InterfaceStability.Stable</a>
 <div class="block">Can evolve while retaining compatibility for minor release boundaries.;
@@ -2798,11 +2788,6 @@ service.</div>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.LimitedPrivate.html#org.apache.hadoop.hbase.thrift">InterfaceAudience.LimitedPrivate</a>
-<div class="block">Intended only for the project(s) specified in the annotation.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.Private.html#org.apache.hadoop.hbase.thrift">InterfaceAudience.Private</a>
 <div class="block">Intended for use only within Hadoop itself.</div>
 </td>
@@ -2820,6 +2805,11 @@ service.</div>
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.LimitedPrivate.html#org.apache.hadoop.hbase.thrift2">InterfaceAudience.LimitedPrivate</a>
+<div class="block">Intended only for the project(s) specified in the annotation.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="../../../../../org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.Private.html#org.apache.hadoop.hbase.thrift2">InterfaceAudience.Private</a>
 <div class="block">Intended for use only within Hadoop itself.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html b/devapidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html
index b823246..36a8709 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html
@@ -227,7 +227,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/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html#line.32">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html#line.29">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:
@@ -244,7 +244,7 @@ for (Admin.CompactType c : Admin.CompactType.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html#line.32">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html#line.29">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html b/devapidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html
index 0aa553f..fd4651d 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html
@@ -224,7 +224,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/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.32">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.29">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:
@@ -241,7 +241,7 @@ for (Admin.MasterSwitchType c : Admin.MasterSwitchType.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.32">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.29">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html b/devapidocs/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html
index 0c0033f..d7e93e7 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html
@@ -260,7 +260,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/client/AsyncProcess.Retry.html" title="enum in org.apache.hadoop.hbase.client">AsyncProcess.Retry</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html#line.1885">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.Retry.html" title="enum in org.apache.hadoop.hbase.client">AsyncProcess.Retry</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html#line.50">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:
@@ -277,7 +277,7 @@ for (AsyncProcess.Retry c : AsyncProcess.Retry.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.Retry.html" title="enum in org.apache.hadoop.hbase.client">AsyncProcess.Retry</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html#line.1885">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.Retry.html" title="enum in org.apache.hadoop.hbase.client">AsyncProcess.Retry</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AsyncProcess.Retry.html#line.50">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html b/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html
index 7cf401d..9564a07 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/TableState.State.html
@@ -260,7 +260,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/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client">TableState.State</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TableState.State.html#line.220">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client">TableState.State</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TableState.State.html#line.30">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:
@@ -277,7 +277,7 @@ for (TableState.State c : TableState.State.values())
 <ul class="blockList">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client">TableState.State</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TableState.State.html#line.220">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client">TableState.State</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TableState.State.html#line.30">valueOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html b/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html
index 2736f33..b7a6a60 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/backoff/class-use/ServerStatistics.html
@@ -137,19 +137,19 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span class="strong">ClientBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span class="strong">ClientBackoffPolicyFactory.NoBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.NoBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
                             byte[]&nbsp;region,
                             <a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ServerStatistics.html" title="class in org.apache.hadoop.hbase.client.backoff">ServerStatistics</a>&nbsp;stats)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span class="strong">ClientBackoffPolicyFactory.NoBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.NoBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span class="strong">ExponentialClientBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
                             byte[]&nbsp;region,
                             <a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ServerStatistics.html" title="class in org.apache.hadoop.hbase.client.backoff">ServerStatistics</a>&nbsp;stats)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span class="strong">ExponentialClientBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
+<td class="colLast"><span class="strong">ClientBackoffPolicy.</span><code><strong><a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicy.html#getBackoffTime(org.apache.hadoop.hbase.ServerName,%20byte[],%20org.apache.hadoop.hbase.client.backoff.ServerStatistics)">getBackoffTime</a></strong>(<a href="../../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
                             byte[]&nbsp;region,
                             <a href="../../../../../../../org/apache/hadoop/hbase/client/backoff/ServerStatistics.html" title="class in org.apache.hadoop.hbase.client.backoff">ServerStatistics</a>&nbsp;stats)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.CompactType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.CompactType.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.CompactType.html
index 0da980f..c272de6 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.CompactType.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.CompactType.html
@@ -120,21 +120,21 @@ the order they are declared.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#compact(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#compact(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">compact</a></strong>(<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/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Compact a table.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#compact(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#compact(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">compact</a></strong>(<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/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Compact a table.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#compact(org.apache.hadoop.hbase.TableName,%20byte[],%20org.apache.hadoop.hbase.client.Admin.CompactType)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#compact(org.apache.hadoop.hbase.TableName,%20byte[],%20org.apache.hadoop.hbase.client.Admin.CompactType)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
               byte[]&nbsp;columnFamily,
               <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Compact a column family within a table.</div>
@@ -142,7 +142,7 @@ the order they are declared.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#compact(org.apache.hadoop.hbase.TableName,%20byte[],%20org.apache.hadoop.hbase.client.Admin.CompactType)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#compact(org.apache.hadoop.hbase.TableName,%20byte[],%20org.apache.hadoop.hbase.client.Admin.CompactType)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
               byte[]&nbsp;columnFamily,
               <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Compact a column family within a table.</div>
@@ -159,35 +159,35 @@ the order they are declared.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#getCompactionState(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">getCompactionState</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#getCompactionState(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">getCompactionState</a></strong>(<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/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Get the current compaction state of a table.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#getCompactionState(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">getCompactionState</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#getCompactionState(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">getCompactionState</a></strong>(<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/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Get the current compaction state of a table.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#majorCompact(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">majorCompact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#majorCompact(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">majorCompact</a></strong>(<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/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Major compact a table.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#majorCompact(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">majorCompact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#majorCompact(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Admin.CompactType)">majorCompact</a></strong>(<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/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Major compact a table.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#majorCompact(org.apache.hadoop.hbase.TableName,%20byte[],%20org.apache.hadoop.hbase.client.Admin.CompactType)">majorCompact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#majorCompact(org.apache.hadoop.hbase.TableName,%20byte[],%20org.apache.hadoop.hbase.client.Admin.CompactType)">majorCompact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                         byte[]&nbsp;columnFamily,
                         <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Major compact a column family within a table.</div>
@@ -195,7 +195,7 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#majorCompact(org.apache.hadoop.hbase.TableName,%20byte[],%20org.apache.hadoop.hbase.client.Admin.CompactType)">majorCompact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#majorCompact(org.apache.hadoop.hbase.TableName,%20byte[],%20org.apache.hadoop.hbase.client.Admin.CompactType)">majorCompact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                         byte[]&nbsp;columnFamily,
                         <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>&nbsp;compactType)</code>
 <div class="block">Major compact a column family within a table.</div>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html
index 979fc6b..11fc409 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html
@@ -146,29 +146,29 @@ the order they are declared.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#isSplitOrMergeEnabled(org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">isSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#isSplitOrMergeEnabled(org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">isSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>
 <div class="block">Query the current state of the switch</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#isSplitOrMergeEnabled(org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">isSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean[]</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">setSplitOrMergeEnabled</a></strong>(boolean&nbsp;enabled,
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">setSplitOrMergeEnabled</a></strong>(boolean&nbsp;enabled,
                                             boolean&nbsp;synchronous,
                                             boolean&nbsp;skipLock,
-                                            <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>...&nbsp;switchTypes)</code>&nbsp;</td>
+                                            <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>...&nbsp;switchTypes)</code>
+<div class="block">Turn the Split or Merge switches on or off.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean[]</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">setSplitOrMergeEnabled</a></strong>(boolean&nbsp;enabled,
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">setSplitOrMergeEnabled</a></strong>(boolean&nbsp;enabled,
                                             boolean&nbsp;synchronous,
                                             boolean&nbsp;skipLock,
-                                            <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>...&nbsp;switchTypes)</code>
-<div class="block">Turn the Split or Merge switches on or off.</div>
-</td>
+                                            <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>...&nbsp;switchTypes)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -192,18 +192,18 @@ the order they are declared.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BaseMasterObserver.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#postSetSplitOrMergeEnabled(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">postSetSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
-                                                    boolean&nbsp;newValue,
-                                                    <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">MasterObserver.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postSetSplitOrMergeEnabled(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">postSetSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
                                                     boolean&nbsp;newValue,
                                                     <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>
 <div class="block">Called after setting split / merge switch</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">BaseMasterObserver.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#postSetSplitOrMergeEnabled(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">postSetSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
+                                                    boolean&nbsp;newValue,
+                                                    <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="strong">BaseMasterAndRegionObserver.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.html#preSetSplitOrMergeEnabled(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">preSetSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
@@ -212,18 +212,18 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">BaseMasterObserver.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#preSetSplitOrMergeEnabled(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">preSetSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
-                                                  boolean&nbsp;newValue,
-                                                  <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><span class="strong">MasterObserver.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preSetSplitOrMergeEnabled(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">preSetSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
                                                   boolean&nbsp;newValue,
                                                   <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>
 <div class="block">Called prior to setting split / merge switch</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="strong">BaseMasterObserver.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.html#preSetSplitOrMergeEnabled(org.apache.hadoop.hbase.coprocessor.ObserverContext,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">preSetSplitOrMergeEnabled</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/ObserverContext.html" title="class in org.apache.hadoop.hbase.coprocessor">ObserverContext</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.html" title="interface in org.apache.hadoop.hbase.coprocessor">MasterCoprocessorEnvironment</a>&gt;&nbsp;ctx,
+                                                  boolean&nbsp;newValue,
+                                                  <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>&nbsp;switchType)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83cfd2ad/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html
index 8c20694..3b2fac6 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Admin.html
@@ -165,21 +165,21 @@ service.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
-<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getAdmin()">getAdmin</a></strong>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
 <td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HConnection.html#getAdmin()">getAdmin</a></strong>()</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;</div>
 <div class="block">Retrieve an Admin implementation to administer an HBase cluster.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
 <td class="colLast"><span class="strong">Connection.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Connection.html#getAdmin()">getAdmin</a></strong>()</code>
 <div class="block">Retrieve an Admin implementation to administer an HBase cluster.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
+<td class="colLast"><span class="strong">ConnectionImplementation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/ConnectionImplementation.html#getAdmin()">getAdmin</a></strong>()</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -262,13 +262,13 @@ service.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">SplitNormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
+<td class="colLast"><span class="strong">MergeNormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
 <div class="block">Executes normalization plan on cluster (does actual splitting/merging work).</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">NormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
+<td class="colLast"><span class="strong">SplitNormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
 <div class="block">Executes normalization plan on cluster (does actual splitting/merging work).</div>
 </td>
 </tr>
@@ -280,7 +280,7 @@ service.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">MergeNormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
+<td class="colLast"><span class="strong">NormalizationPlan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html#execute(org.apache.hadoop.hbase.client.Admin)">execute</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;admin)</code>
 <div class="block">Executes normalization plan on cluster (does actual splitting/merging work).</div>
 </td>
 </tr>
@@ -460,17 +460,17 @@ service.</div>
 <td class="colLast"><span class="strong">HBaseFsck.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/HBaseFsck.html#admin">admin</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
-<td class="colLast"><span class="strong">ConnectionCache.ConnectionInfo.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/ConnectionCache.ConnectionInfo.html#admin">admin</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
 <td class="colLast"><span class="strong">RegionMover.MoveWithAck.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/RegionMover.MoveWithAck.html#admin">admin</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
 <td class="colLast"><span class="strong">RegionMover.MoveWithoutAck.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/RegionMover.MoveWithoutAck.html#admin">admin</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></code></td>
+<td class="colLast"><span class="strong">ConnectionCache.ConnectionInfo.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/util/ConnectionCache.ConnectionInfo.html#admin">admin</a></strong></code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">


Mime
View raw message