http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/zookeeper/package-frame.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/package-frame.html 
b/devapidocs/org/apache/hadoop/hbase/zookeeper/package-frame.html
index 23c062f..085a99d 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/package-frame.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/package-frame.html
@@ -14,13 +14,12 @@
 <h2 title="Interfaces">Interfaces</h2>
 <ul title="Interfaces">
 <li><a href="MetricsZooKeeperSource.html" title="interface in 
org.apache.hadoop.hbase.zookeeper" target="classFrame"><span 
class="interfaceName">MetricsZooKeeperSource</span></a></li>
-<li><a href="ZooKeeperMetricsListener.html" title="interface in 
org.apache.hadoop.hbase.zookeeper" target="classFrame"><span 
class="interfaceName">ZooKeeperMetricsListener</span></a></li>
+<li><a href="ZKMetricsListener.html" title="interface in 
org.apache.hadoop.hbase.zookeeper" target="classFrame"><span 
class="interfaceName">ZKMetricsListener</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
 <li><a href="ClusterStatusTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ClusterStatusTracker</a></li>
 <li><a href="DeletionListener.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">DeletionListener</a></li>
-<li><a href="DrainingServerTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">DrainingServerTracker</a></li>
 <li><a href="EmptyWatcher.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">EmptyWatcher</a></li>
 <li><a href="HQuorumPeer.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">HQuorumPeer</a></li>
 <li><a href="InstancePending.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">InstancePending</a></li>
@@ -29,21 +28,22 @@
 <li><a href="MasterAddressTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">MasterAddressTracker</a></li>
 <li><a href="MasterMaintenanceModeTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">MasterMaintenanceModeTracker</a></li>
 <li><a href="MetaTableLocator.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">MetaTableLocator</a></li>
-<li><a href="MetricsZooKeeper.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">MetricsZooKeeper</a></li>
 <li><a href="MetricsZooKeeperSourceImpl.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">MetricsZooKeeperSourceImpl</a></li>
 <li><a href="MiniZooKeeperCluster.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">MiniZooKeeperCluster</a></li>
 <li><a href="PendingWatcher.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">PendingWatcher</a></li>
 <li><a href="RecoverableZooKeeper.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">RecoverableZooKeeper</a></li>
 <li><a href="RegionNormalizerTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">RegionNormalizerTracker</a></li>
-<li><a href="RegionServerTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">RegionServerTracker</a></li>
-<li><a href="SplitOrMergeTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">SplitOrMergeTracker</a></li>
-<li><a href="SplitOrMergeTracker.SwitchStateTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">SplitOrMergeTracker.SwitchStateTracker</a></li>
-<li><a href="ZkAclReset.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZkAclReset</a></li>
+<li><a href="ZKAclReset.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKAclReset</a></li>
 <li><a href="ZKClusterId.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKClusterId</a></li>
 <li><a href="ZKConfig.html" title="class in org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZKConfig</a></li>
 <li><a href="ZKConfig.ZKClusterKey.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZKConfig.ZKClusterKey</a></li>
 <li><a href="ZKLeaderManager.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKLeaderManager</a></li>
+<li><a href="ZKListener.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKListener</a></li>
+<li><a href="ZKMainServer.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKMainServer</a></li>
+<li><a href="ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html" 
title="class in org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain</a></li>
 <li><a href="ZKMetadata.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKMetadata</a></li>
+<li><a href="ZKMetrics.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKMetrics</a></li>
+<li><a href="ZKNodeTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKNodeTracker</a></li>
 <li><a href="ZKServerTool.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKServerTool</a></li>
 <li><a href="ZKSplitLog.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKSplitLog</a></li>
 <li><a href="ZKUtil.html" title="class in org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZKUtil</a></li>
@@ -53,12 +53,8 @@
 <li><a href="ZKUtil.ZKUtilOp.CreateAndFailSilent.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZKUtil.ZKUtilOp.CreateAndFailSilent</a></li>
 <li><a href="ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZKUtil.ZKUtilOp.DeleteNodeFailSilent</a></li>
 <li><a href="ZKUtil.ZKUtilOp.SetData.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZKUtil.ZKUtilOp.SetData</a></li>
+<li><a href="ZKWatcher.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZKWatcher</a></li>
 <li><a href="ZNodePaths.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZNodePaths</a></li>
-<li><a href="ZooKeeperListener.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZooKeeperListener</a></li>
-<li><a href="ZooKeeperMainServer.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZooKeeperMainServer</a></li>
-<li><a href="ZooKeeperMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html" 
title="class in org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZooKeeperMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain</a></li>
-<li><a href="ZooKeeperNodeTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper" 
target="classFrame">ZooKeeperNodeTracker</a></li>
-<li><a href="ZooKeeperWatcher.html" title="class in 
org.apache.hadoop.hbase.zookeeper" target="classFrame">ZooKeeperWatcher</a></li>
 </ul>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/zookeeper/package-summary.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/package-summary.html 
b/devapidocs/org/apache/hadoop/hbase/zookeeper/package-summary.html
index 092a0f1..07ac69a 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/package-summary.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/package-summary.html
@@ -89,7 +89,7 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperMetricsListener.html"
 title="interface in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperMetricsListener</a></td>
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMetricsListener.html" 
title="interface in 
org.apache.hadoop.hbase.zookeeper">ZKMetricsListener</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
@@ -116,65 +116,53 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/DrainingServerTracker.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">DrainingServerTracker</a></td>
-<td class="colLast">
-<div class="block">Tracks the list of draining region servers via ZK.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/EmptyWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">EmptyWatcher</a></td>
 <td class="colLast">
 <div class="block">An empty ZooKeeper watcher</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html" 
title="class in org.apache.hadoop.hbase.zookeeper">HQuorumPeer</a></td>
 <td class="colLast">
 <div class="block">HBase's version of ZooKeeper's QuorumPeer.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/InstancePending.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">InstancePending</a>&lt;T&gt;</td>
 <td class="colLast">
 <div class="block">Placeholder of an instance which will be accessed by other 
threads
  but is not yet created.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/InstancePending.InstanceHolder.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">InstancePending.InstanceHolder</a>&lt;T&gt;</td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper">LoadBalancerTracker</a></td>
 <td class="colLast">
 <div class="block">Tracks the load balancer state up in ZK</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">MasterAddressTracker</a></td>
 <td class="colLast">
 <div class="block">Manages the location of the current active Master for the 
RegionServer.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">MasterMaintenanceModeTracker</a></td>
 <td class="colLast">
 <div class="block">Tracks the master Maintenance Mode via ZK.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html" 
title="class in org.apache.hadoop.hbase.zookeeper">MetaTableLocator</a></td>
 <td class="colLast">
 <div class="block">Utility class to perform operation (get/wait 
for/verify/set/delete) on znode in ZooKeeper
  which keeps hbase:meta region server location.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetricsZooKeeper.html" 
title="class in org.apache.hadoop.hbase.zookeeper">MetricsZooKeeper</a></td>
-<td class="colLast">
-<div class="block">Class used to push numbers about ZooKeeper into the metrics 
subsystem.</div>
-</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSourceImpl.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">MetricsZooKeeperSourceImpl</a></td>
 <td class="colLast">
@@ -206,23 +194,7 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/RegionServerTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper">RegionServerTracker</a></td>
-<td class="colLast">
-<div class="block">Tracks the online region servers via ZK.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/SplitOrMergeTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper">SplitOrMergeTracker</a></td>
-<td class="colLast">
-<div class="block">Tracks the switch of split and merge states in ZK</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">SplitOrMergeTracker.SwitchStateTracker</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZkAclReset.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZkAclReset</a></td>
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKAclReset.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKAclReset</a></td>
 <td class="colLast">
 <div class="block">You may add the jaas.conf option
     -Djava.security.auth.login.config=/PATH/jaas.conf
@@ -234,29 +206,48 @@
  Use -set-acls to set the ACLs, no option to erase ACLs</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKClusterId.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKClusterId</a></td>
 <td class="colLast">
 <div class="block">Publishes and synchronizes a unique identifier specific to 
a given HBase
  cluster.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKConfig</a></td>
 <td class="colLast">
 <div class="block">Utility methods for reading, and building the ZooKeeper 
configuration.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">ZKConfig.ZKClusterKey</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKLeaderManager</a></td>
 <td class="colLast">Deprecated
 <div class="block"><span class="deprecationComment">Not used</span></div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKListener.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKListener</a></td>
+<td class="colLast">
+<div class="block">Base class for internal listeners of ZooKeeper events.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMainServer.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKMainServer</a></td>
+<td class="colLast">
+<div class="block">Tool for running ZookeeperMain from HBase by  reading a 
ZooKeeper server
+ from HBase XML configuration.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain</a></td>
+<td class="colLast">
+<div class="block">ZooKeeper 3.4.6 broke being able to pass commands on 
command line.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMetadata.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKMetadata</a></td>
 <td class="colLast">
@@ -264,6 +255,18 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMetrics.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKMetrics</a></td>
+<td class="colLast">
+<div class="block">Class used to push numbers about ZooKeeper into the metrics 
subsystem.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKNodeTracker</a></td>
+<td class="colLast">
+<div class="block">Tracks the availability and value of a single ZooKeeper 
node.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKServerTool.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKServerTool</a></td>
 <td class="colLast">
 <div class="block">Tool for reading ZooKeeper servers from HBase XML 
configuration and producing
@@ -273,9 +276,7 @@
 <tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKSplitLog.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKSplitLog</a></td>
 <td class="colLast">
-<div class="block">Common methods and attributes used by <a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.html" 
title="class in org.apache.hadoop.hbase.master"><code>SplitLogManager</code></a>
- and <a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.html" 
title="class in 
org.apache.hadoop.hbase.regionserver"><code>SplitLogWorker</code></a>
- running distributed splitting of WAL logs.</div>
+<div class="block">Common methods and attributes used by SplitLogManager and 
SplitLogWorker running distributed splitting of WAL logs.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -323,40 +324,15 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZNodePaths.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZNodePaths</a></td>
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a></td>
 <td class="colLast">
-<div class="block">Class that hold all the paths of znode for HBase.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperListener.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperListener</a></td>
-<td class="colLast">
-<div class="block">Base class for internal listeners of ZooKeeper events.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServer.html"
 title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperMainServer</a></td>
-<td class="colLast">
-<div class="block">Tool for running ZookeeperMain from HBase by  reading a 
ZooKeeper server
- from HBase XML configuration.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain</a></td>
-<td class="colLast">
-<div class="block">ZooKeeper 3.4.6 broke being able to pass commands on 
command line.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperNodeTracker</a></td>
-<td class="colLast">
-<div class="block">Tracks the availability and value of a single ZooKeeper 
node.</div>
+<div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a></td>
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZNodePaths.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZNodePaths</a></td>
 <td class="colLast">
-<div class="block">Acts as the single ZooKeeper Watcher.</div>
+<div class="block">Class that hold all the paths of znode for HBase.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/zookeeper/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/zookeeper/package-tree.html
index 2b88ab2..5db3cde 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/package-tree.html
@@ -93,7 +93,7 @@
 </li>
 <li type="circle">org.apache.hadoop.conf.Configured (implements 
org.apache.hadoop.conf.Configurable)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZkAclReset.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZkAclReset</span></a> (implements 
org.apache.hadoop.util.Tool)</li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKAclReset.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKAclReset</span></a> (implements 
org.apache.hadoop.util.Tool)</li>
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/EmptyWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">EmptyWatcher</span></a> (implements 
org.apache.zookeeper.Watcher)</li>
@@ -101,52 +101,48 @@
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/InstancePending.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">InstancePending</span></a>&lt;T&gt;</li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/InstancePending.InstanceHolder.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">InstancePending.InstanceHolder</span></a>&lt;T&gt;</li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetaTableLocator.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MetaTableLocator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetricsZooKeeper.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MetricsZooKeeper</span></a> (implements 
org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperMetricsListener.html"
 title="interface in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperMetricsListener</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MiniZooKeeperCluster</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/PendingWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">PendingWatcher</span></a> (implements 
org.apache.zookeeper.Watcher)</li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">RecoverableZooKeeper</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/SplitOrMergeTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">SplitOrMergeTracker</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKClusterId.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKClusterId</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKConfig</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKConfig.ZKClusterKey</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMetadata.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMetadata</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKServerTool.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKServerTool</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKSplitLog.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKSplitLog</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.NodeAndData</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp</span></a>
-<ul>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp.CreateAndFailSilent</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp.DeleteNodeFailSilent</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp.SetData</span></a></li>
-</ul>
-</li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZNodePaths.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZNodePaths</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperListener.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperListener</span></a>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKListener.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKListener</span></a>
 <ul>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/DeletionListener.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">DeletionListener</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/DrainingServerTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">DrainingServerTracker</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MasterMaintenanceModeTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/RegionServerTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">RegionServerTracker</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKLeaderManager</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperNodeTracker</span></a>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKNodeTracker</span></a>
 <ul>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ClusterStatusTracker</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">LoadBalancerTracker</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MasterAddressTracker</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">RegionNormalizerTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">SplitOrMergeTracker.SwitchStateTracker</span></a></li>
 </ul>
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMainServer.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMainServer</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMetadata.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMetadata</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMetrics.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMetrics</span></a> (implements 
org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMetricsListener.html" 
title="interface in 
org.apache.hadoop.hbase.zookeeper">ZKMetricsListener</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKServerTool.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKServerTool</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKSplitLog.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKSplitLog</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.NodeAndData</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp</span></a>
+<ul>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp.CreateAndFailSilent</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp.DeleteNodeFailSilent</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp.SetData</span></a></li>
+</ul>
+</li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKWatcher</span></a> (implements 
org.apache.hadoop.hbase.<a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>, 
org.apache.zookeeper.Watcher)</li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZNodePaths.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZNodePaths</span></a></li>
 <li type="circle">org.apache.zookeeper.ZooKeeperMain
 <ul>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain</span></a></li>
 </ul>
 </li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServer.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperMainServer</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperWatcher</span></a> (implements 
org.apache.hadoop.hbase.<a 
href="../../../../../org/apache/hadoop/hbase/Abortable.html" title="interface 
in org.apache.hadoop.hbase">Abortable</a>, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>, 
org.apache.zookeeper.Watcher)</li>
 </ul>
 </li>
 </ul>
@@ -157,7 +153,7 @@
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/MetricsZooKeeperSource.html"
 title="interface in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MetricsZooKeeperSource</span></a></li>
 </ul>
 </li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperMetricsListener.html"
 title="interface in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperMetricsListener</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKMetricsListener.html" 
title="interface in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMetricsListener</span></a></li>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/zookeeper/package-use.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/package-use.html 
b/devapidocs/org/apache/hadoop/hbase/zookeeper/package-use.html
index b944ba9..3f895db 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/package-use.html
@@ -181,19 +181,19 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase">ZKListener</a>
+<div class="block">Base class for internal listeners of ZooKeeper events.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKUtil.NodeAndData.html#org.apache.hadoop.hbase">ZKUtil.NodeAndData</a>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">Unused</span></div>
 </div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase">ZooKeeperListener</a>
-<div class="block">Base class for internal listeners of ZooKeeper events.</div>
-</td>
-</tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -210,12 +210,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.backup.example">ZooKeeperListener</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.backup.example">ZKListener</a>
 <div class="block">Base class for internal listeners of ZooKeeper events.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.backup.example">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.backup.example">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -249,12 +249,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.coordination">ZooKeeperListener</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.coordination">ZKListener</a>
 <div class="block">Base class for internal listeners of ZooKeeper events.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.coordination">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.coordination">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -271,47 +271,37 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/DrainingServerTracker.html#org.apache.hadoop.hbase.master">DrainingServerTracker</a>
-<div class="block">Tracks the list of draining region servers via ZK.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/LoadBalancerTracker.html#org.apache.hadoop.hbase.master">LoadBalancerTracker</a>
 <div class="block">Tracks the load balancer state up in ZK</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/MasterMaintenanceModeTracker.html#org.apache.hadoop.hbase.master">MasterMaintenanceModeTracker</a>
 <div class="block">Tracks the master Maintenance Mode via ZK.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/MiniZooKeeperCluster.html#org.apache.hadoop.hbase.master">MiniZooKeeperCluster</a>
 <div class="block">TODO: Most of the code in this class is ripped from 
ZooKeeper tests.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/RegionNormalizerTracker.html#org.apache.hadoop.hbase.master">RegionNormalizerTracker</a>
 <div class="block">Tracks region normalizer state up in ZK</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/RegionServerTracker.html#org.apache.hadoop.hbase.master">RegionServerTracker</a>
-<div class="block">Tracks the online region servers via ZK.</div>
-</td>
-</tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/SplitOrMergeTracker.html#org.apache.hadoop.hbase.master">SplitOrMergeTracker</a>
-<div class="block">Tracks the switch of split and merge states in ZK</div>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.master">ZKListener</a>
+<div class="block">Base class for internal listeners of ZooKeeper events.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.master">ZooKeeperListener</a>
-<div class="block">Base class for internal listeners of ZooKeeper events.</div>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKNodeTracker.html#org.apache.hadoop.hbase.master">ZKNodeTracker</a>
+<div class="block">Tracks the availability and value of a single ZooKeeper 
node.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.master">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.master">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -328,7 +318,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.master.cleaner">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.master.cleaner">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -345,7 +335,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.master.replication">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.master.replication">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -362,12 +352,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.procedure">ZooKeeperListener</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.procedure">ZKListener</a>
 <div class="block">Base class for internal listeners of ZooKeeper events.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.procedure">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.procedure">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -400,12 +390,12 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperNodeTracker.html#org.apache.hadoop.hbase.regionserver">ZooKeeperNodeTracker</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKNodeTracker.html#org.apache.hadoop.hbase.regionserver">ZKNodeTracker</a>
 <div class="block">Tracks the availability and value of a single ZooKeeper 
node.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.regionserver">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.regionserver">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -422,17 +412,17 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.replication">ZooKeeperListener</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.replication">ZKListener</a>
 <div class="block">Base class for internal listeners of ZooKeeper events.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperNodeTracker.html#org.apache.hadoop.hbase.replication">ZooKeeperNodeTracker</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKNodeTracker.html#org.apache.hadoop.hbase.replication">ZKNodeTracker</a>
 <div class="block">Tracks the availability and value of a single ZooKeeper 
node.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.replication">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.replication">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -449,7 +439,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.replication.master">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.replication.master">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -472,7 +462,7 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.replication.regionserver">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.replication.regionserver">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -489,7 +479,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.rsgroup">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.rsgroup">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -506,19 +496,19 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.security.access">ZKListener</a>
+<div class="block">Base class for internal listeners of ZooKeeper events.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKUtil.NodeAndData.html#org.apache.hadoop.hbase.security.access">ZKUtil.NodeAndData</a>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">Unused</span></div>
 </div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.security.access">ZooKeeperListener</a>
-<div class="block">Base class for internal listeners of ZooKeeper events.</div>
-</td>
-</tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.security.access">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.security.access">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -548,19 +538,19 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.security.token">ZKListener</a>
+<div class="block">Base class for internal listeners of ZooKeeper events.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKUtil.NodeAndData.html#org.apache.hadoop.hbase.security.token">ZKUtil.NodeAndData</a>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">Unused</span></div>
 </div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.security.token">ZooKeeperListener</a>
-<div class="block">Base class for internal listeners of ZooKeeper events.</div>
-</td>
-</tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.security.token">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.security.token">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -577,12 +567,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.security.visibility">ZooKeeperListener</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.security.visibility">ZKListener</a>
 <div class="block">Base class for internal listeners of ZooKeeper events.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.security.visibility">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.security.visibility">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -599,7 +589,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.util">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.util">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -616,7 +606,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.util.hbck">ZooKeeperWatcher</a>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.util.hbck">ZKWatcher</a>
 <div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
@@ -657,10 +647,20 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/SplitOrMergeTracker.SwitchStateTracker.html#org.apache.hadoop.hbase.zookeeper">SplitOrMergeTracker.SwitchStateTracker</a>&nbsp;</td>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKConfig.ZKClusterKey.html#org.apache.hadoop.hbase.zookeeper">ZKConfig.ZKClusterKey</a>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKConfig.ZKClusterKey.html#org.apache.hadoop.hbase.zookeeper">ZKConfig.ZKClusterKey</a>&nbsp;</td>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKListener.html#org.apache.hadoop.hbase.zookeeper">ZKListener</a>
+<div class="block">Base class for internal listeners of ZooKeeper events.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKMetricsListener.html#org.apache.hadoop.hbase.zookeeper">ZKMetricsListener</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKNodeTracker.html#org.apache.hadoop.hbase.zookeeper">ZKNodeTracker</a>
+<div class="block">Tracks the availability and value of a single ZooKeeper 
node.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKUtil.NodeAndData.html#org.apache.hadoop.hbase.zookeeper">ZKUtil.NodeAndData</a>
@@ -692,26 +692,13 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZNodePaths.html#org.apache.hadoop.hbase.zookeeper">ZNodePaths</a>
-<div class="block">Class that hold all the paths of znode for HBase.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperListener.html#org.apache.hadoop.hbase.zookeeper">ZooKeeperListener</a>
-<div class="block">Base class for internal listeners of ZooKeeper events.</div>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZKWatcher.html#org.apache.hadoop.hbase.zookeeper">ZKWatcher</a>
+<div class="block">Acts as the single ZooKeeper Watcher.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperMetricsListener.html#org.apache.hadoop.hbase.zookeeper">ZooKeeperMetricsListener</a>&nbsp;</td>
-</tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperNodeTracker.html#org.apache.hadoop.hbase.zookeeper">ZooKeeperNodeTracker</a>
-<div class="block">Tracks the availability and value of a single ZooKeeper 
node.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZooKeeperWatcher.html#org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>
-<div class="block">Acts as the single ZooKeeper Watcher.</div>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/class-use/ZNodePaths.html#org.apache.hadoop.hbase.zookeeper">ZNodePaths</a>
+<div class="block">Class that hold all the paths of znode for HBase.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/overview-tree.html b/devapidocs/overview-tree.html
index 168b1a5..b65b675 100644
--- a/devapidocs/overview-tree.html
+++ b/devapidocs/overview-tree.html
@@ -1308,7 +1308,7 @@
 <li type="circle">org.apache.hadoop.hbase.thrift2.<a 
href="org/apache/hadoop/hbase/thrift2/ThriftServer.html" title="class in 
org.apache.hadoop.hbase.thrift2"><span 
class="typeNameLink">ThriftServer</span></a> (implements 
org.apache.hadoop.util.Tool)</li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.replication.<a 
href="org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.html" 
title="class in org.apache.hadoop.hbase.mapreduce.replication"><span 
class="typeNameLink">VerifyReplication</span></a> (implements 
org.apache.hadoop.util.Tool)</li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a 
href="org/apache/hadoop/hbase/mapreduce/WALPlayer.html" title="class in 
org.apache.hadoop.hbase.mapreduce"><span 
class="typeNameLink">WALPlayer</span></a> (implements 
org.apache.hadoop.util.Tool)</li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZkAclReset.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZkAclReset</span></a> (implements 
org.apache.hadoop.util.Tool)</li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKAclReset.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKAclReset</span></a> (implements 
org.apache.hadoop.util.Tool)</li>
 <li type="circle">org.apache.hadoop.hbase.backup.example.<a 
href="org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.html" 
title="class in org.apache.hadoop.hbase.backup.example"><span 
class="typeNameLink">ZKTableArchiveClient</span></a></li>
 </ul>
 </li>
@@ -2262,7 +2262,6 @@
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregateImpl.MetricsTableValues.html"
 title="class in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">MetricsTableWrapperAggregateImpl.MetricsTableValues</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregateImpl.TableMetricsWrapperRunnable.html"
 title="class in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">MetricsTableWrapperAggregateImpl.TableMetricsWrapperRunnable</span></a>
 (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true";
 title="class or interface in java.lang">Runnable</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a 
href="org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.html" 
title="class in org.apache.hadoop.hbase.thrift"><span 
class="typeNameLink">MetricsThriftServerSourceFactoryImpl</span></a> 
(implements org.apache.hadoop.hbase.thrift.<a 
href="org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.html" 
title="interface in 
org.apache.hadoop.hbase.thrift">MetricsThriftServerSourceFactory</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/MetricsZooKeeper.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MetricsZooKeeper</span></a> (implements 
org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZooKeeperMetricsListener.html" 
title="interface in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperMetricsListener</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="org/apache/hadoop/hbase/regionserver/MiniBatchOperationInProgress.html" 
title="class in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">MiniBatchOperationInProgress</span></a>&lt;T&gt;</li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MiniZooKeeperCluster</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mob.compactions.<a 
href="org/apache/hadoop/hbase/mob/compactions/MobCompactionRequest.html" 
title="class in org.apache.hadoop.hbase.mob.compactions"><span 
class="typeNameLink">MobCompactionRequest</span></a>
@@ -3408,7 +3407,7 @@
 </li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="org/apache/hadoop/hbase/regionserver/SplitLogWorker.html" title="class in 
org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">SplitLogWorker</span></a> (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true";
 title="class or interface in java.lang">Runnable</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.master.normalizer.<a 
href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" 
title="class in org.apache.hadoop.hbase.master.normalizer"><span 
class="typeNameLink">SplitNormalizationPlan</span></a> (implements 
org.apache.hadoop.hbase.master.normalizer.<a 
href="org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" 
title="interface in 
org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/SplitOrMergeTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">SplitOrMergeTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a 
href="org/apache/hadoop/hbase/master/SplitOrMergeTracker.html" title="class in 
org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitOrMergeTracker</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="org/apache/hadoop/hbase/regionserver/SplitRequest.html" title="class in 
org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">SplitRequest</span></a> (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true";
 title="class or interface in java.lang">Runnable</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.master.assignment.<a 
href="org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html"
 title="class in org.apache.hadoop.hbase.master.assignment"><span 
class="typeNameLink">SplitTableRegionProcedure.StoreFileSplitter</span></a> 
(implements java.util.concurrent.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true";
 title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;)</li>
 <li type="circle">javax.rmi.ssl.<a 
href="http://docs.oracle.com/javase/8/docs/api/javax/rmi/ssl/SslRMIClientSocketFactory.html?is-external=true";
 title="class or interface in javax.rmi.ssl"><span 
class="typeNameLink">SslRMIClientSocketFactory</span></a> (implements 
java.rmi.server.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/rmi/server/RMIClientSocketFactory.html?is-external=true";
 title="class or interface in java.rmi.server">RMIClientSocketFactory</a>, 
java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
@@ -4077,7 +4076,41 @@
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKConfig.ZKClusterKey</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/ZkCoordinatedStateManager.html" 
title="class in org.apache.hadoop.hbase.coordination"><span 
class="typeNameLink">ZkCoordinatedStateManager</span></a> (implements 
org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/CoordinatedStateManager.html" title="interface in 
org.apache.hadoop.hbase">CoordinatedStateManager</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a 
href="org/apache/hadoop/hbase/util/ZKDataMigrator.html" title="class in 
org.apache.hadoop.hbase.util"><span 
class="typeNameLink">ZKDataMigrator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKListener.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKListener</span></a>
+<ul>
+<li type="circle">org.apache.hadoop.hbase.master.<a 
href="org/apache/hadoop/hbase/master/ActiveMasterManager.html" title="class in 
org.apache.hadoop.hbase.master"><span 
class="typeNameLink">ActiveMasterManager</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/DeletionListener.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">DeletionListener</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a 
href="org/apache/hadoop/hbase/master/DrainingServerTracker.html" title="class 
in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">DrainingServerTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.PeerRegionServerListener.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">HBaseReplicationEndpoint.PeerRegionServerListener</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MasterMaintenanceModeTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a 
href="org/apache/hadoop/hbase/master/RegionServerTracker.html" title="class in 
org.apache.hadoop.hbase.master"><span 
class="typeNameLink">RegionServerTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/ReplicationTrackerZKImpl.OtherRegionServerWatcher.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">ReplicationTrackerZKImpl.OtherRegionServerWatcher</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/ReplicationTrackerZKImpl.PeersWatcher.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">ReplicationTrackerZKImpl.PeersWatcher</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.example.<a 
href="org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.html" 
title="class in org.apache.hadoop.hbase.backup.example"><span 
class="typeNameLink">TableHFileArchiveTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKLeaderManager</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/ZKNamespaceManager.html" title="class in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">ZKNamespaceManager</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKNodeTracker</span></a>
+<ul>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ClusterStatusTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">LoadBalancerTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MasterAddressTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">RegionNormalizerTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.PeerConfigTracker.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">ReplicationPeerZKImpl.PeerConfigTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.PeerStateTracker.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">ReplicationPeerZKImpl.PeerStateTracker</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a 
href="org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitOrMergeTracker.SwitchStateTracker</span></a></li>
+</ul>
+</li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a 
href="org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.html" 
title="class in org.apache.hadoop.hbase.security.access"><span 
class="typeNameLink">ZKPermissionWatcher</span></a> (implements java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a 
href="org/apache/hadoop/hbase/procedure/ZKProcedureUtil.html" title="class in 
org.apache.hadoop.hbase.procedure"><span 
class="typeNameLink">ZKProcedureUtil</span></a> (implements java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.security.token.<a 
href="org/apache/hadoop/hbase/security/token/ZKSecretWatcher.html" title="class 
in org.apache.hadoop.hbase.security.token"><span 
class="typeNameLink">ZKSecretWatcher</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.html" 
title="class in org.apache.hadoop.hbase.coordination"><span 
class="typeNameLink">ZKSplitLogManagerCoordination</span></a> (implements 
org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/SplitLogManagerCoordination.html" 
title="interface in 
org.apache.hadoop.hbase.coordination">SplitLogManagerCoordination</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/ZkSplitLogWorkerCoordination.html" 
title="class in org.apache.hadoop.hbase.coordination"><span 
class="typeNameLink">ZkSplitLogWorkerCoordination</span></a> (implements 
org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/SplitLogWorkerCoordination.html" 
title="interface in 
org.apache.hadoop.hbase.coordination">SplitLogWorkerCoordination</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.security.visibility.<a 
href="org/apache/hadoop/hbase/security/visibility/ZKVisibilityLabelWatcher.html"
 title="class in org.apache.hadoop.hbase.security.visibility"><span 
class="typeNameLink">ZKVisibilityLabelWatcher</span></a></li>
+</ul>
+</li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKMainServer.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMainServer</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKMetadata.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMetadata</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKMetrics.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMetrics</span></a> (implements 
org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKMetricsListener.html" 
title="interface in 
org.apache.hadoop.hbase.zookeeper">ZKMetricsListener</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.procedure.<a 
href="org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html" 
title="class in org.apache.hadoop.hbase.procedure"><span 
class="typeNameLink">ZKProcedureCoordinator</span></a> (implements 
org.apache.hadoop.hbase.procedure.<a 
href="org/apache/hadoop/hbase/procedure/ProcedureCoordinatorRpcs.html" 
title="interface in 
org.apache.hadoop.hbase.procedure">ProcedureCoordinatorRpcs</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.procedure.<a 
href="org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html" 
title="class in org.apache.hadoop.hbase.procedure"><span 
class="typeNameLink">ZKProcedureMemberRpcs</span></a> (implements 
org.apache.hadoop.hbase.procedure.<a 
href="org/apache/hadoop/hbase/procedure/ProcedureMemberRpcs.html" 
title="interface in 
org.apache.hadoop.hbase.procedure">ProcedureMemberRpcs</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKServerTool.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKServerTool</span></a></li>
@@ -4097,49 +4130,16 @@
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKUtil.ZKUtilOp.SetData</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKWatcher</span></a> (implements 
org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/Abortable.html" 
title="interface in org.apache.hadoop.hbase">Abortable</a>, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>, 
org.apache.zookeeper.Watcher)</li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/ZNodeClearer.html" title="class in 
org.apache.hadoop.hbase"><span class="typeNameLink">ZNodeClearer</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZNodePaths.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZNodePaths</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZooKeeperListener.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperListener</span></a>
-<ul>
-<li type="circle">org.apache.hadoop.hbase.master.<a 
href="org/apache/hadoop/hbase/master/ActiveMasterManager.html" title="class in 
org.apache.hadoop.hbase.master"><span 
class="typeNameLink">ActiveMasterManager</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/DeletionListener.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">DeletionListener</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/DrainingServerTracker.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">DrainingServerTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.PeerRegionServerListener.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">HBaseReplicationEndpoint.PeerRegionServerListener</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MasterMaintenanceModeTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/RegionServerTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">RegionServerTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/ReplicationTrackerZKImpl.OtherRegionServerWatcher.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">ReplicationTrackerZKImpl.OtherRegionServerWatcher</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/ReplicationTrackerZKImpl.PeersWatcher.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">ReplicationTrackerZKImpl.PeersWatcher</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.backup.example.<a 
href="org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.html" 
title="class in org.apache.hadoop.hbase.backup.example"><span 
class="typeNameLink">TableHFileArchiveTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKLeaderManager</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/ZKNamespaceManager.html" title="class in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">ZKNamespaceManager</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a 
href="org/apache/hadoop/hbase/security/access/ZKPermissionWatcher.html" 
title="class in org.apache.hadoop.hbase.security.access"><span 
class="typeNameLink">ZKPermissionWatcher</span></a> (implements java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a 
href="org/apache/hadoop/hbase/procedure/ZKProcedureUtil.html" title="class in 
org.apache.hadoop.hbase.procedure"><span 
class="typeNameLink">ZKProcedureUtil</span></a> (implements java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.security.token.<a 
href="org/apache/hadoop/hbase/security/token/ZKSecretWatcher.html" title="class 
in org.apache.hadoop.hbase.security.token"><span 
class="typeNameLink">ZKSecretWatcher</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.html" 
title="class in org.apache.hadoop.hbase.coordination"><span 
class="typeNameLink">ZKSplitLogManagerCoordination</span></a> (implements 
org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/SplitLogManagerCoordination.html" 
title="interface in 
org.apache.hadoop.hbase.coordination">SplitLogManagerCoordination</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/ZkSplitLogWorkerCoordination.html" 
title="class in org.apache.hadoop.hbase.coordination"><span 
class="typeNameLink">ZkSplitLogWorkerCoordination</span></a> (implements 
org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/SplitLogWorkerCoordination.html" 
title="interface in 
org.apache.hadoop.hbase.coordination">SplitLogWorkerCoordination</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.security.visibility.<a 
href="org/apache/hadoop/hbase/security/visibility/ZKVisibilityLabelWatcher.html"
 title="class in org.apache.hadoop.hbase.security.visibility"><span 
class="typeNameLink">ZKVisibilityLabelWatcher</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperNodeTracker</span></a>
-<ul>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ClusterStatusTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">LoadBalancerTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">MasterAddressTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">RegionNormalizerTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.PeerConfigTracker.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">ReplicationPeerZKImpl.PeerConfigTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.PeerStateTracker.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">ReplicationPeerZKImpl.PeerStateTracker</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">SplitOrMergeTracker.SwitchStateTracker</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
 <li type="circle">org.apache.zookeeper.ZooKeeperMain
 <ul>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html"
 title="class in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain</span></a></li>
 </ul>
 </li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZooKeeperMainServer.html" title="class 
in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperMainServer</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.coprocessor.example.<a 
href="org/apache/hadoop/hbase/coprocessor/example/ZooKeeperScanPolicyObserver.html"
 title="class in org.apache.hadoop.hbase.coprocessor.example"><span 
class="typeNameLink">ZooKeeperScanPolicyObserver</span></a> (implements 
org.apache.hadoop.hbase.coprocessor.<a 
href="org/apache/hadoop/hbase/coprocessor/RegionCoprocessor.html" 
title="interface in org.apache.hadoop.hbase.coprocessor">RegionCoprocessor</a>, 
org.apache.hadoop.hbase.coprocessor.<a 
href="org/apache/hadoop/hbase/coprocessor/RegionObserver.html" title="interface 
in org.apache.hadoop.hbase.coprocessor">RegionObserver</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.coprocessor.example.<a 
href="org/apache/hadoop/hbase/coprocessor/example/ZooKeeperScanPolicyObserver.ZKDataHolder.html"
 title="class in org.apache.hadoop.hbase.coprocessor.example"><span 
class="typeNameLink">ZooKeeperScanPolicyObserver.ZKDataHolder</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" title="class in 
org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperWatcher</span></a> (implements 
org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/Abortable.html" 
title="interface in org.apache.hadoop.hbase">Abortable</a>, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true";
 title="class or interface in java.io">Closeable</a>, 
org.apache.zookeeper.Watcher)</li>
 </ul>
 </li>
 </ul>
@@ -4997,8 +4997,8 @@
 <li type="circle">org.apache.hadoop.hbase.wal.<a 
href="org/apache/hadoop/hbase/wal/WALProvider.html" title="interface in 
org.apache.hadoop.hbase.wal"><span 
class="typeNameLink">WALProvider</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.<a 
href="org/apache/hadoop/hbase/io/WritableWithSize.html" title="interface in 
org.apache.hadoop.hbase.io"><span 
class="typeNameLink">WritableWithSize</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="org/apache/hadoop/hbase/client/ZKAsyncRegistry.CuratorEventProcessor.html"
 title="interface in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">ZKAsyncRegistry.CuratorEventProcessor</span></a>&lt;T&gt;</li>
+<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZKMetricsListener.html" 
title="interface in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZKMetricsListener</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.coordination.<a 
href="org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.TaskFinisher.html"
 title="interface in org.apache.hadoop.hbase.coordination"><span 
class="typeNameLink">ZKSplitLogManagerCoordination.TaskFinisher</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.zookeeper.<a 
href="org/apache/hadoop/hbase/zookeeper/ZooKeeperMetricsListener.html" 
title="interface in org.apache.hadoop.hbase.zookeeper"><span 
class="typeNameLink">ZooKeeperMetricsListener</span></a></li>
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/serialized-form.html
----------------------------------------------------------------------
diff --git a/devapidocs/serialized-form.html b/devapidocs/serialized-form.html
index 693bd28..35aa696 100644
--- a/devapidocs/serialized-form.html
+++ b/devapidocs/serialized-form.html
@@ -2404,10 +2404,10 @@
 <li class="blockList">
 <h2 title="Package">Package&nbsp;org.apache.hadoop.hbase.zookeeper</h2>
 <ul class="blockList">
-<li class="blockList"><a 
name="org.apache.hadoop.hbase.zookeeper.TestZooKeeperMainServer.ExitException">
+<li class="blockList"><a 
name="org.apache.hadoop.hbase.zookeeper.TestZKMainServer.ExitException">
 <!--   -->
 </a>
-<h3>Class 
org.apache.hadoop.hbase.zookeeper.TestZooKeeperMainServer.ExitException extends 
<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/SecurityException.html?is-external=true";
 title="class or interface in java.lang">SecurityException</a> implements 
Serializable</h3>
+<h3>Class org.apache.hadoop.hbase.zookeeper.TestZKMainServer.ExitException 
extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/SecurityException.html?is-external=true";
 title="class or interface in java.lang">SecurityException</a> implements 
Serializable</h3>
 <dl class="nameValue">
 <dt>serialVersionUID:</dt>
 <dd>1L</dd>

Reply via email to