http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/org/apache/hadoop/hbase/security/class-use/User.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/class-use/User.html
b/devapidocs/org/apache/hadoop/hbase/security/class-use/User.html
index af3c56d..c58d582 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/class-use/User.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/class-use/User.html
@@ -556,8 +556,8 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postCompletedCreateTableAction-org.apache.hadoop.hbase.client.TableDescriptor-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.security.User-">postCompletedCreateTableAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/TableDescriptor.html"
title="interface in
org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
- <a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a>[] regions,
+<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postCompletedCreateTableAction-org.apache.hadoop.hbase.client.TableDescriptor-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.security.User-">postCompletedCreateTableAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/TableDescriptor.html"
title="interface in
org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
+ <a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a>[] regions,
<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in
org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
<tr class="rowColor">
@@ -583,8 +583,8 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postCompletedMergeRegionsAction-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.security.User-">postCompletedMergeRegionsAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a>[] regionsToMerge,
- <a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a> mergedRegion,
+<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postCompletedMergeRegionsAction-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.security.User-">postCompletedMergeRegionsAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge,
+ <a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a> mergedRegion,
<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in org.apache.hadoop.hbase.security">User</a> user)</code>
<div class="block">Invoked after completing merge regions operation</div>
</td>
@@ -603,8 +603,8 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postCompletedSplitRegionAction-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.security.User-">postCompletedSplitRegionAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a> regionInfoA,
- <a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a> regionInfoB,
+<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postCompletedSplitRegionAction-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.security.User-">postCompletedSplitRegionAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a> regionInfoA,
+ <a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a> regionInfoB,
<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in org.apache.hadoop.hbase.security">User</a> user)</code>
<div class="block">Invoked just after a split</div>
</td>
@@ -616,15 +616,15 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postMergeRegionsCommit-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.security.User-">postMergeRegionsCommit</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a>[] regionsToMerge,
- <a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a> mergedRegion,
+<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postMergeRegionsCommit-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.security.User-">postMergeRegionsCommit</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge,
+ <a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a> mergedRegion,
<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in org.apache.hadoop.hbase.security">User</a> user)</code>
<div class="block">Invoked after merge regions operation writes the new region
to hbase:meta</div>
</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postRollBackMergeRegionsAction-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.security.User-">postRollBackMergeRegionsAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a>[] regionsToMerge,
+<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postRollBackMergeRegionsAction-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.security.User-">postRollBackMergeRegionsAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge,
<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in org.apache.hadoop.hbase.security">User</a> user)</code>
<div class="block">Invoked after rollback merge regions operation</div>
</td>
@@ -643,8 +643,8 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#preCreateTableAction-org.apache.hadoop.hbase.client.TableDescriptor-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.security.User-">preCreateTableAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/TableDescriptor.html"
title="interface in
org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
- <a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a>[] regions,
+<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#preCreateTableAction-org.apache.hadoop.hbase.client.TableDescriptor-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.security.User-">preCreateTableAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/TableDescriptor.html"
title="interface in
org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
+ <a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a>[] regions,
<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in
org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
<tr class="rowColor">
@@ -670,14 +670,14 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#preMergeRegionsAction-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.security.User-">preMergeRegionsAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a>[] regionsToMerge,
+<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#preMergeRegionsAction-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.security.User-">preMergeRegionsAction</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge,
<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in org.apache.hadoop.hbase.security">User</a> user)</code>
<div class="block">Invoked just before a merge</div>
</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#preMergeRegionsCommit-org.apache.hadoop.hbase.HRegionInfo:A-java.util.List-org.apache.hadoop.hbase.security.User-">preMergeRegionsCommit</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a>[] regionsToMerge,
+<td class="colLast"><span
class="typeNameLabel">MasterCoprocessorHost.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#preMergeRegionsCommit-org.apache.hadoop.hbase.client.RegionInfo:A-java.util.List-org.apache.hadoop.hbase.security.User-">preMergeRegionsCommit</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a>[] regionsToMerge,
<a
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true"
title="class or interface in java.util">List</a><<a
href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html"
title="class in
org.apache.hadoop.hbase.client">Mutation</a>> metaEntries,
<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in org.apache.hadoop.hbase.security">User</a> user)</code>
<div class="block">Invoked before merge regions operation writes the new
region to hbase:meta</div>
@@ -1559,10 +1559,10 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>private void</code></td>
-<td class="colLast"><span
class="typeNameLabel">AccessController.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.html#checkLockPermissions-org.apache.hadoop.hbase.security.User-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.HRegionInfo:A-java.lang.String-">checkLockPermissions</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in org.apache.hadoop.hbase.security">User</a> user,
+<td class="colLast"><span
class="typeNameLabel">AccessController.</span><code><span
class="memberNameLink"><a
href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.html#checkLockPermissions-org.apache.hadoop.hbase.security.User-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.client.RegionInfo:A-java.lang.String-">checkLockPermissions</a></span>(<a
href="../../../../../../org/apache/hadoop/hbase/security/User.html"
title="class in org.apache.hadoop.hbase.security">User</a> user,
<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> namespace,
<a
href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in
org.apache.hadoop.hbase">TableName</a> tableName,
- <a
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class
in org.apache.hadoop.hbase">HRegionInfo</a>[] regionInfos,
+ <a
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html"
title="interface in
org.apache.hadoop.hbase.client">RegionInfo</a>[] regionInfos,
<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> reason)</code> </td>
</tr>
<tr class="rowColor">