http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/org/apache/hadoop/hbase/class-use/MetaMutationAnnotation.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/class-use/MetaMutationAnnotation.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/MetaMutationAnnotation.html
index b171e46..56d62c5 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/MetaMutationAnnotation.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/MetaMutationAnnotation.html
@@ -110,8 +110,8 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>default void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMergeRegionsCommitAction-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo:A-java.util.List-">preMergeRegionsCommitAction</a></span>(<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,
-                           <a 
href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>[]&nbsp;regionsToMerge,
+<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMergeRegionsCommitAction-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.client.RegionInfo:A-java.util.List-">preMergeRegionsCommitAction</a></span>(<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,
+                           <a 
href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionInfo</a>[]&nbsp;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>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class 
in org.apache.hadoop.hbase.client">Mutation</a>&gt;&nbsp;metaEntries)</code>
 <div class="block">This will be called before PONR step as part of regions 
merge transaction.</div>
 </td>
@@ -132,7 +132,7 @@
 <tbody>
 <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>[]&nbsp;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>[]&nbsp;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>&lt;<a 
href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class 
in org.apache.hadoop.hbase.client">Mutation</a>&gt;&nbsp;metaEntries,
                      <a 
href="../../../../../org/apache/hadoop/hbase/security/User.html" title="class 
in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Invoked before merge regions operation writes the new 
region to hbase:meta</div>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
index abaf35b..22f5ad9 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
@@ -2063,8 +2063,8 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>default void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">postMove</a></span>(<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,
-        <a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" 
title="class in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
+<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">postMove</a></span>(<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,
+        <a 
href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;region,
         <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
         <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>
 <div class="block">Called after the region move has been requested.</div>
@@ -2072,8 +2072,8 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>default void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<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,
-       <a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" 
title="class in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
+<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<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,
+       <a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;region,
        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>
 <div class="block">Called prior to moving a given region from one region 
server to another.</div>
@@ -3310,13 +3310,13 @@ Input/OutputFormats, a table indexing MapReduce job, 
and utility methods.</div>
 </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#postMove-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">postMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
+<td class="colLast"><span 
class="typeNameLabel">MasterCoprocessorHost.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postMove-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">postMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;region,
         <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
         <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>&nbsp;</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#preMove-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
+<td class="colLast"><span 
class="typeNameLabel">MasterCoprocessorHost.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#preMove-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;region,
        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>&nbsp;</td>
 </tr>
@@ -5363,8 +5363,8 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>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#preMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<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;c,
-       <a href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" 
title="class in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;region,
+<td class="colLast"><span 
class="typeNameLabel">AccessController.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/security/access/AccessController.html#preMove-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.ServerName-">preMove</a></span>(<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;c,
+       <a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;region,
        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;srcServer,
        <a href="../../../../../org/apache/hadoop/hbase/ServerName.html" 
title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;destServer)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html
index 01d2141..9857de6 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html
@@ -5336,10 +5336,10 @@ service.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>default void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postRequestLock-org.apache.hadoop.hbase.coprocessor.ObserverContext-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">postRequestLock</a></span>(<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,
+<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#postRequestLock-org.apache.hadoop.hbase.coprocessor.ObserverContext-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">postRequestLock</a></span>(<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,
                <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                <a href="../../../../../org/apache/hadoop/hbase/TableName.html" 
title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
-               <a 
href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>[]&nbsp;regionInfos,
+               <a 
href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionInfo</a>[]&nbsp;regionInfos,
                <a 
href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" 
title="enum in org.apache.hadoop.hbase.procedure2">LockType</a>&nbsp;type,
                <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;description)</code>
 <div class="block">Called after new LockProcedure is queued.</div>
@@ -5486,10 +5486,10 @@ service.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>default void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preRequestLock-org.apache.hadoop.hbase.coprocessor.ObserverContext-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">preRequestLock</a></span>(<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,
+<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preRequestLock-org.apache.hadoop.hbase.coprocessor.ObserverContext-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">preRequestLock</a></span>(<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,
               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
               <a href="../../../../../org/apache/hadoop/hbase/TableName.html" 
title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
-              <a 
href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>[]&nbsp;regionInfos,
+              <a 
href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionInfo</a>[]&nbsp;regionInfos,
               <a 
href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" 
title="enum in org.apache.hadoop.hbase.procedure2">LockType</a>&nbsp;type,
               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;description)</code>
 <div class="block">Called before new LockProcedure is queued.</div>
@@ -6422,9 +6422,9 @@ service.</div>
 </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#postRequestLock-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">postRequestLock</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
+<td class="colLast"><span 
class="typeNameLabel">MasterCoprocessorHost.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#postRequestLock-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">postRequestLock</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
                <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/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>[]&nbsp;regionInfos,
+               <a 
href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionInfo</a>[]&nbsp;regionInfos,
                <a 
href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" 
title="enum in org.apache.hadoop.hbase.procedure2">LockType</a>&nbsp;type,
                <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&nbsp;description)</code>&nbsp;</td>
 </tr>
@@ -6520,9 +6520,9 @@ service.</div>
 </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#preRequestLock-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">preRequestLock</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
+<td class="colLast"><span 
class="typeNameLabel">MasterCoprocessorHost.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html#preRequestLock-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">preRequestLock</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
               <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/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>[]&nbsp;regionInfos,
+              <a 
href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionInfo</a>[]&nbsp;regionInfos,
               <a 
href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" 
title="enum in org.apache.hadoop.hbase.procedure2">LockType</a>&nbsp;type,
               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&nbsp;description)</code>&nbsp;</td>
 </tr>
@@ -9670,10 +9670,10 @@ service.</div>
 </tr>
 <tr class="rowColor">
 <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>&nbsp;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>&nbsp;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>&nbsp;namespace,
                     <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/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>[]&nbsp;regionInfos,
+                    <a 
href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionInfo</a>[]&nbsp;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>&nbsp;reason)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -9907,10 +9907,10 @@ service.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>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#preRequestLock-org.apache.hadoop.hbase.coprocessor.ObserverContext-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.HRegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">preRequestLock</a></span>(<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,
+<td class="colLast"><span 
class="typeNameLabel">AccessController.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/security/access/AccessController.html#preRequestLock-org.apache.hadoop.hbase.coprocessor.ObserverContext-java.lang.String-org.apache.hadoop.hbase.TableName-org.apache.hadoop.hbase.client.RegionInfo:A-org.apache.hadoop.hbase.procedure2.LockType-java.lang.String-">preRequestLock</a></span>(<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,
               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;namespace,
               <a href="../../../../../org/apache/hadoop/hbase/TableName.html" 
title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
-              <a 
href="../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in 
org.apache.hadoop.hbase">HRegionInfo</a>[]&nbsp;regionInfos,
+              <a 
href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionInfo</a>[]&nbsp;regionInfos,
               <a 
href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" 
title="enum in org.apache.hadoop.hbase.procedure2">LockType</a>&nbsp;type,
               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&nbsp;description)</code>&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html
index 60b8a6c..df91ecf 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html
@@ -456,8 +456,8 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>default void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMergeRegionsCommitAction-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.HRegionInfo:A-java.util.List-">preMergeRegionsCommitAction</a></span>(<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,
-                           <a 
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class 
in org.apache.hadoop.hbase">HRegionInfo</a>[]&nbsp;regionsToMerge,
+<td class="colLast"><span 
class="typeNameLabel">MasterObserver.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/coprocessor/MasterObserver.html#preMergeRegionsCommitAction-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.client.RegionInfo:A-java.util.List-">preMergeRegionsCommitAction</a></span>(<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,
+                           <a 
href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" 
title="interface in 
org.apache.hadoop.hbase.client">RegionInfo</a>[]&nbsp;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>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html" 
title="class in 
org.apache.hadoop.hbase.client">Mutation</a>&gt;&nbsp;metaEntries)</code>
 <div class="block">This will be called before PONR step as part of regions 
merge transaction.</div>
 </td>
@@ -588,7 +588,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.</div>
 <tbody>
 <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>[]&nbsp;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>[]&nbsp;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>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html" 
title="class in 
org.apache.hadoop.hbase.client">Mutation</a>&gt;&nbsp;metaEntries,
                      <a 
href="../../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Invoked before merge regions operation writes the new 
region to hbase:meta</div>

Reply via email to