http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/class-use/Abortable.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/Abortable.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/Abortable.html
index d760ef6..5ef6a02 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Abortable.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Abortable.html
@@ -533,6 +533,42 @@
 </tr>
 </tbody>
 </table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a 
href="../../../../../org/apache/hadoop/hbase/master/package-summary.html">org.apache.hadoop.hbase.master</a>
 declared as <a href="../../../../../org/apache/hadoop/hbase/Abortable.html" 
title="interface in org.apache.hadoop.hbase">Abortable</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">DrainingServerTracker.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/DrainingServerTracker.html#abortable">abortable</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a 
href="../../../../../org/apache/hadoop/hbase/master/package-summary.html">org.apache.hadoop.hbase.master</a>
 with parameters of type <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/DrainingServerTracker.html#DrainingServerTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.master.ServerManager-">DrainingServerTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
+                     <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable,
+                     <a 
href="../../../../../org/apache/hadoop/hbase/master/ServerManager.html" 
title="class in 
org.apache.hadoop.hbase.master">ServerManager</a>&nbsp;serverManager)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html#SplitOrMergeTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">SplitOrMergeTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
+                   org.apache.hadoop.conf.Configuration&nbsp;conf,
+                   <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html#SwitchStateTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-java.lang.String-org.apache.hadoop.hbase.Abortable-">SwitchStateTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
+                  <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;node,
+                  <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
 </li>
 <li class="blockList"><a name="org.apache.hadoop.hbase.master.cleaner">
 <!--   -->
@@ -545,13 +581,13 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html#ReplicationQueueDeletor-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationQueueDeletor</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html#ReplicationQueueDeletor-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationQueueDeletor</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zk,
                        org.apache.hadoop.conf.Configuration&nbsp;conf,
                        <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html#ReplicationZKNodeCleaner-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">ReplicationZKNodeCleaner</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
-                        <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zkw,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html#ReplicationZKNodeCleaner-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">ReplicationZKNodeCleaner</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                        <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zkw,
                         <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 </tbody>
@@ -568,8 +604,8 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/replication/ReplicationManager.html#ReplicationManager-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">ReplicationManager</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
-                  <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zkw,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/replication/ReplicationManager.html#ReplicationManager-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">ReplicationManager</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                  <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zkw,
                   <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 </tbody>
@@ -794,20 +830,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeers.html" 
title="interface in 
org.apache.hadoop.hbase.replication">ReplicationPeers</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ReplicationFactory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationFactory.html#getReplicationPeers-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">getReplicationPeers</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk,
+<td class="colLast"><span 
class="typeNameLabel">ReplicationFactory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationFactory.html#getReplicationPeers-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">getReplicationPeers</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zk,
                    org.apache.hadoop.conf.Configuration&nbsp;conf,
                    <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeers.html" 
title="interface in 
org.apache.hadoop.hbase.replication">ReplicationPeers</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ReplicationFactory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationFactory.html#getReplicationPeers-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.replication.ReplicationQueuesClient-org.apache.hadoop.hbase.Abortable-">getReplicationPeers</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk,
+<td class="colLast"><span 
class="typeNameLabel">ReplicationFactory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationFactory.html#getReplicationPeers-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.replication.ReplicationQueuesClient-org.apache.hadoop.hbase.Abortable-">getReplicationPeers</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zk,
                    org.apache.hadoop.conf.Configuration&nbsp;conf,
                    <a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesClient.html"
 title="interface in 
org.apache.hadoop.hbase.replication">ReplicationQueuesClient</a>&nbsp;queuesClient,
                    <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationTracker.html"
 title="interface in 
org.apache.hadoop.hbase.replication">ReplicationTracker</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ReplicationFactory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationFactory.html#getReplicationTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.replication.ReplicationPeers-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.Stoppable-">getReplicationTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zookeeper,
+<td class="colLast"><span 
class="typeNameLabel">ReplicationFactory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationFactory.html#getReplicationTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.replication.ReplicationPeers-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.Stoppable-">getReplicationTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zookeeper,
                      <a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeers.html" 
title="interface in 
org.apache.hadoop.hbase.replication">ReplicationPeers</a>&nbsp;replicationPeers,
                      org.apache.hadoop.conf.Configuration&nbsp;conf,
                      <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable,
@@ -837,23 +873,23 @@
        <a href="../../../../../org/apache/hadoop/hbase/Abortable.html" 
title="interface in 
org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.PeerConfigTracker.html#PeerConfigTracker-java.lang.String-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">PeerConfigTracker</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;peerConfigNode,
-                 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.PeerConfigTracker.html#PeerConfigTracker-java.lang.String-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">PeerConfigTracker</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;peerConfigNode,
+                 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
                  <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.PeerStateTracker.html#PeerStateTracker-java.lang.String-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">PeerStateTracker</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;peerStateZNode,
-                <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.PeerStateTracker.html#PeerStateTracker-java.lang.String-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">PeerStateTracker</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;peerStateZNode,
+                <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
                 <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.html#ReplicationPeersZKImpl-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.replication.ReplicationQueuesClient-org.apache.hadoop.hbase.Abortable-">ReplicationPeersZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.html#ReplicationPeersZKImpl-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.replication.ReplicationQueuesClient-org.apache.hadoop.hbase.Abortable-">ReplicationPeersZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zk,
                       org.apache.hadoop.conf.Configuration&nbsp;conf,
                       <a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesClient.html"
 title="interface in 
org.apache.hadoop.hbase.replication">ReplicationQueuesClient</a>&nbsp;queuesClient,
                       <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html#ReplicationPeerZKImpl-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-java.lang.String-org.apache.hadoop.hbase.replication.ReplicationPeerConfig-org.apache.hadoop.hbase.Abortable-">ReplicationPeerZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zkWatcher,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html#ReplicationPeerZKImpl-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-java.lang.String-org.apache.hadoop.hbase.replication.ReplicationPeerConfig-org.apache.hadoop.hbase.Abortable-">ReplicationPeerZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zkWatcher,
                      org.apache.hadoop.conf.Configuration&nbsp;conf,
                      <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;id,
                      <a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeerConfig.html"
 title="class in 
org.apache.hadoop.hbase.replication">ReplicationPeerConfig</a>&nbsp;peerConfig,
@@ -867,31 +903,31 @@
                           <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abort)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesArguments.html#ReplicationQueuesArguments-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-">ReplicationQueuesArguments</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesArguments.html#ReplicationQueuesArguments-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.zookeeper.ZKWatcher-">ReplicationQueuesArguments</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                           <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abort,
-                          <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk)</code>&nbsp;</td>
+                          <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zk)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesClientArguments.html#ReplicationQueuesClientArguments-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationQueuesClientArguments</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                 <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abort)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesClientArguments.html#ReplicationQueuesClientArguments-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-">ReplicationQueuesClientArguments</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesClientArguments.html#ReplicationQueuesClientArguments-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.zookeeper.ZKWatcher-">ReplicationQueuesClientArguments</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                 <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abort,
-                                <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk)</code>&nbsp;</td>
+                                <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zk)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesClientZKImpl.html#ReplicationQueuesClientZKImpl-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationQueuesClientZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesClientZKImpl.html#ReplicationQueuesClientZKImpl-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationQueuesClientZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zk,
                              org.apache.hadoop.conf.Configuration&nbsp;conf,
                              <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesZKImpl.html#ReplicationQueuesZKImpl-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationQueuesZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationQueuesZKImpl.html#ReplicationQueuesZKImpl-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationQueuesZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zk,
                        org.apache.hadoop.conf.Configuration&nbsp;conf,
                        <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationStateZKBase.html#ReplicationStateZKBase-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationStateZKBase</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zookeeper,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationStateZKBase.html#ReplicationStateZKBase-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">ReplicationStateZKBase</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zookeeper,
                       org.apache.hadoop.conf.Configuration&nbsp;conf,
                       <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
@@ -900,7 +936,7 @@
                     <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abort)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationTrackerZKImpl.html#ReplicationTrackerZKImpl-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.replication.ReplicationPeers-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.Stoppable-">ReplicationTrackerZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zookeeper,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationTrackerZKImpl.html#ReplicationTrackerZKImpl-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.replication.ReplicationPeers-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.Stoppable-">ReplicationTrackerZKImpl</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zookeeper,
                         <a 
href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeers.html" 
title="interface in 
org.apache.hadoop.hbase.replication">ReplicationPeers</a>&nbsp;replicationPeers,
                         org.apache.hadoop.conf.Configuration&nbsp;conf,
                         <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable,
@@ -911,9 +947,9 @@
                                      <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesImpl.html#TableBasedReplicationQueuesImpl-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-">TableBasedReplicationQueuesImpl</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesImpl.html#TableBasedReplicationQueuesImpl-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.zookeeper.ZKWatcher-">TableBasedReplicationQueuesImpl</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abort,
-                               <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zkw)</code>&nbsp;</td>
+                               <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zkw)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -946,7 +982,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/master/TableCFsUpdater.html#TableCFsUpdater-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">TableCFsUpdater</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zookeeper,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/replication/master/TableCFsUpdater.html#TableCFsUpdater-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">TableCFsUpdater</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zookeeper,
                org.apache.hadoop.conf.Configuration&nbsp;conf,
                <a href="../../../../../org/apache/hadoop/hbase/Abortable.html" 
title="interface in 
org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
@@ -1016,7 +1052,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a></span></code>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -1031,7 +1067,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ZooKeeperWatcher.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#abortable">abortable</a></span></code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">ZKWatcher.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html#abortable">abortable</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a></code></td>
@@ -1039,14 +1075,10 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ZooKeeperNodeTracker.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.html#abortable">abortable</a></span></code>
+<td class="colLast"><span 
class="typeNameLabel">ZKNodeTracker.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html#abortable">abortable</a></span></code>
 <div class="block">Used to abort if a fatal error occurs</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>private <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">DrainingServerTracker.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/DrainingServerTracker.html#abortable">abortable</a></span></code>&nbsp;</td>
-</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing constructors, and an explanation">
@@ -1056,64 +1088,49 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.html#ClusterStatusTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">ClusterStatusTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.html#ClusterStatusTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">ClusterStatusTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
                     <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>
 <div class="block">Creates a cluster status tracker.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/DrainingServerTracker.html#DrainingServerTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-org.apache.hadoop.hbase.master.ServerManager-">DrainingServerTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
-                     <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable,
-                     <a 
href="../../../../../org/apache/hadoop/hbase/master/ServerManager.html" 
title="class in 
org.apache.hadoop.hbase.master">ServerManager</a>&nbsp;serverManager)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.html#LoadBalancerTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">LoadBalancerTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.html#LoadBalancerTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">LoadBalancerTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
                    <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.html#MasterAddressTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">MasterAddressTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.html#MasterAddressTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">MasterAddressTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
                     <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>
 <div class="block">Construct a master address listener with the specified
  <code>zookeeper</code> reference.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html#RegionNormalizerTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">RegionNormalizerTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
-                       <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/SplitOrMergeTracker.html#SplitOrMergeTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">SplitOrMergeTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
-                   org.apache.hadoop.conf.Configuration&nbsp;conf,
-                   <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html#RegionNormalizerTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">RegionNormalizerTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
+                       <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/SplitOrMergeTracker.SwitchStateTracker.html#SwitchStateTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-java.lang.String-org.apache.hadoop.hbase.Abortable-">SwitchStateTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
-                  <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;node,
-                  <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKClusterId.html#ZKClusterId-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">ZKClusterId</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKClusterId.html#ZKClusterId-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">ZKClusterId</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
            <a href="../../../../../org/apache/hadoop/hbase/Abortable.html" 
title="interface in 
org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.html#ZooKeeperNodeTracker-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-java.lang.String-org.apache.hadoop.hbase.Abortable-">ZooKeeperNodeTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
-                    <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;node,
-                    <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html#ZKNodeTracker-org.apache.hadoop.hbase.zookeeper.ZKWatcher-java.lang.String-org.apache.hadoop.hbase.Abortable-">ZKNodeTracker</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
+             <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;node,
+             <a href="../../../../../org/apache/hadoop/hbase/Abortable.html" 
title="interface in 
org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>
 <div class="block">Constructs a new ZK node tracker.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-java.lang.String-org.apache.hadoop.hbase.Abortable-">ZooKeeperWatcher</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
-                <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;identifier,
-                <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html#ZKWatcher-org.apache.hadoop.conf.Configuration-java.lang.String-org.apache.hadoop.hbase.Abortable-">ZKWatcher</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+         <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;identifier,
+         <a href="../../../../../org/apache/hadoop/hbase/Abortable.html" 
title="interface in 
org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable)</code>
 <div class="block">Instantiate a ZooKeeper connection and watcher.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-java.lang.String-org.apache.hadoop.hbase.Abortable-boolean-">ZooKeeperWatcher</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
-                <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;identifier,
-                <a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable,
-                boolean&nbsp;canCreateBaseZNode)</code>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html#ZKWatcher-org.apache.hadoop.conf.Configuration-java.lang.String-org.apache.hadoop.hbase.Abortable-boolean-">ZKWatcher</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+         <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;identifier,
+         <a href="../../../../../org/apache/hadoop/hbase/Abortable.html" 
title="interface in org.apache.hadoop.hbase">Abortable</a>&nbsp;abortable,
+         boolean&nbsp;canCreateBaseZNode)</code>
 <div class="block">Instantiate a ZooKeeper connection and watcher.</div>
 </td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/class-use/ClusterId.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/ClusterId.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/ClusterId.html
index 584d38a..70ce5a2 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/ClusterId.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/ClusterId.html
@@ -216,7 +216,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span class="typeNameLabel">ZKClusterId.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKClusterId.html#setClusterId-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.ClusterId-">setClusterId</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<td class="colLast"><span class="typeNameLabel">ZKClusterId.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKClusterId.html#setClusterId-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.ClusterId-">setClusterId</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
             <a href="../../../../../org/apache/hadoop/hbase/ClusterId.html" 
title="class in 
org.apache.hadoop.hbase">ClusterId</a>&nbsp;id)</code>&nbsp;</td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/class-use/NotAllMetaRegionsOnlineException.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/class-use/NotAllMetaRegionsOnlineException.html
 
b/devapidocs/org/apache/hadoop/hbase/class-use/NotAllMetaRegionsOnlineException.html
index c90ac47..9b31d9e 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/class-use/NotAllMetaRegionsOnlineException.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/class-use/NotAllMetaRegionsOnlineException.html
@@ -131,8 +131,8 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService.BlockingInterface</code></td>
-<td class="colLast"><span 
class="typeNameLabel">MetaTableLocator.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html#getMetaServerConnection-org.apache.hadoop.hbase.client.ClusterConnection-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-long-int-">getMetaServerConnection</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/ClusterConnection.html" 
title="interface in 
org.apache.hadoop.hbase.client">ClusterConnection</a>&nbsp;connection,
-                       <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zkw,
+<td class="colLast"><span 
class="typeNameLabel">MetaTableLocator.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html#getMetaServerConnection-org.apache.hadoop.hbase.client.ClusterConnection-org.apache.hadoop.hbase.zookeeper.ZKWatcher-long-int-">getMetaServerConnection</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/client/ClusterConnection.html" 
title="interface in 
org.apache.hadoop.hbase.client">ClusterConnection</a>&nbsp;connection,
+                       <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zkw,
                        long&nbsp;timeout,
                        int&nbsp;replicaId)</code>
 <div class="block">Gets a connection to the server hosting meta, as reported 
by ZooKeeper,
@@ -141,7 +141,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">MetaTableLocator.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html#waitMetaRegionLocation-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-int-long-">waitMetaRegionLocation</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zkw,
+<td class="colLast"><span 
class="typeNameLabel">MetaTableLocator.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html#waitMetaRegionLocation-org.apache.hadoop.hbase.zookeeper.ZKWatcher-int-long-">waitMetaRegionLocation</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zkw,
                       int&nbsp;replicaId,
                       long&nbsp;timeout)</code>
 <div class="block">Gets the meta region location, if available, and waits for 
up to the
@@ -150,7 +150,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">MetaTableLocator.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html#waitMetaRegionLocation-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-long-">waitMetaRegionLocation</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zkw,
+<td class="colLast"><span 
class="typeNameLabel">MetaTableLocator.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html#waitMetaRegionLocation-org.apache.hadoop.hbase.zookeeper.ZKWatcher-long-">waitMetaRegionLocation</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;zkw,
                       long&nbsp;timeout)</code>
 <div class="block">Gets the meta region location, if available, and waits for 
up to the
  specified timeout if not immediately available.</div>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
index a46bc24..cefb9d0 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
@@ -295,7 +295,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/ActiveMasterManager.html#ActiveMasterManager-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.Server-">ActiveMasterManager</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/master/ActiveMasterManager.html#ActiveMasterManager-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.Server-">ActiveMasterManager</a></span>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>&nbsp;watcher,
                    <a 
href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in 
org.apache.hadoop.hbase">ServerName</a>&nbsp;sn,
                    <a 
href="../../../../../org/apache/hadoop/hbase/Server.html" title="interface in 
org.apache.hadoop.hbase">Server</a>&nbsp;master)</code>&nbsp;</td>
 </tr>

Reply via email to