http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.SwitchStateTracker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.SwitchStateTracker.html
 
b/devapidocs/org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.SwitchStateTracker.html
new file mode 100644
index 0000000..1bd40aa
--- /dev/null
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.SwitchStateTracker.html
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class 
org.apache.hadoop.hbase.master.SplitOrMergeTracker.SwitchStateTracker (Apache 
HBase 3.0.0-SNAPSHOT API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class 
org.apache.hadoop.hbase.master.SplitOrMergeTracker.SwitchStateTracker (Apache 
HBase 3.0.0-SNAPSHOT API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in org.apache.hadoop.hbase.master">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../../index.html?org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.SwitchStateTracker.html"
 target="_top">Frames</a></li>
+<li><a href="SplitOrMergeTracker.SwitchStateTracker.html" 
target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a 
href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class 
org.apache.hadoop.hbase.master.SplitOrMergeTracker.SwitchStateTracker" 
class="title">Uses of 
Class<br>org.apache.hadoop.hbase.master.SplitOrMergeTracker.SwitchStateTracker</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker.SwitchStateTracker</a></span><span
 class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a 
href="#org.apache.hadoop.hbase.master">org.apache.hadoop.hbase.master</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.apache.hadoop.hbase.master">
+<!--   -->
+</a>
+<h3>Uses of <a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker.SwitchStateTracker</a> in 
<a 
href="../../../../../../org/apache/hadoop/hbase/master/package-summary.html">org.apache.hadoop.hbase.master</a></h3>
+<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/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker.SwitchStateTracker</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/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker.SwitchStateTracker</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">SplitOrMergeTracker.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html#mergeStateTracker">mergeStateTracker</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker.SwitchStateTracker</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">SplitOrMergeTracker.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html#splitStateTracker">splitStateTracker</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in org.apache.hadoop.hbase.master">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../../index.html?org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.SwitchStateTracker.html"
 target="_top">Frames</a></li>
+<li><a href="SplitOrMergeTracker.SwitchStateTracker.html" 
target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a 
href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2017 <a 
href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.html 
b/devapidocs/org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.html
new file mode 100644
index 0000000..c37690c
--- /dev/null
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.html
@@ -0,0 +1,178 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class org.apache.hadoop.hbase.master.SplitOrMergeTracker 
(Apache HBase 3.0.0-SNAPSHOT API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class 
org.apache.hadoop.hbase.master.SplitOrMergeTracker (Apache HBase 3.0.0-SNAPSHOT 
API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html"
 title="class in org.apache.hadoop.hbase.master">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../../index.html?org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.html"
 target="_top">Frames</a></li>
+<li><a href="SplitOrMergeTracker.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a 
href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class org.apache.hadoop.hbase.master.SplitOrMergeTracker" 
class="title">Uses of 
Class<br>org.apache.hadoop.hbase.master.SplitOrMergeTracker</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a 
href="#org.apache.hadoop.hbase.master">org.apache.hadoop.hbase.master</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.apache.hadoop.hbase.master">
+<!--   -->
+</a>
+<h3>Uses of <a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html"
 title="class in org.apache.hadoop.hbase.master">SplitOrMergeTracker</a> in <a 
href="../../../../../../org/apache/hadoop/hbase/master/package-summary.html">org.apache.hadoop.hbase.master</a></h3>
+<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/master/SplitOrMergeTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker</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/master/SplitOrMergeTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HMaster.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#splitOrMergeTracker">splitOrMergeTracker</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a 
href="../../../../../../org/apache/hadoop/hbase/master/package-summary.html">org.apache.hadoop.hbase.master</a>
 that return <a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HMaster.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html#getSplitOrMergeTracker--">getSplitOrMergeTracker</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a 
href="../../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html"
 title="class in org.apache.hadoop.hbase.master">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../../index.html?org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.html"
 target="_top">Frames</a></li>
+<li><a href="SplitOrMergeTracker.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a 
href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2017 <a 
href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
index 1134ab7..bc43b39 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
@@ -153,7 +153,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/replication/Replicati
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><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="colOne"><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>
@@ -214,13 +214,13 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/replication/Replicati
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="ReplicationQueueDeletor-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">
+<a 
name="ReplicationQueueDeletor-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.Abortable-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ReplicationQueueDeletor</h4>
-<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html#line.133">ReplicationQueueDeletor</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;zk,
+<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html#line.133">ReplicationQueueDeletor</a>(<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)</pre>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
index e506bfe..eb362f0 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
@@ -167,7 +167,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html#replicationPeers">replicationPeers</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a></code></td>
+<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html#zkw">zkw</a></span></code>&nbsp;</td>
 </tr>
 </table>
@@ -185,8 +185,8 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><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="colOne"><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>
 </table>
@@ -261,7 +261,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>zkw</h4>
-<pre>private final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html"
 title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html#line.51">zkw</a></pre>
+<pre>private final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html#line.51">zkw</a></pre>
 </li>
 </ul>
 <a name="queuesClient">
@@ -299,14 +299,14 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="ReplicationZKNodeCleaner-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">
+<a 
name="ReplicationZKNodeCleaner-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ReplicationZKNodeCleaner</h4>
 <pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html#line.56">ReplicationZKNodeCleaner</a>(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,
+                                <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)
                          throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/package-frame.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-frame.html 
b/devapidocs/org/apache/hadoop/hbase/master/package-frame.html
index 83cd85b..1e9abc9 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-frame.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-frame.html
@@ -44,6 +44,7 @@
 <li><a 
href="ClusterStatusPublisher.MulticastPublisher.ClusterStatusEncoder.html" 
title="class in org.apache.hadoop.hbase.master" 
target="classFrame">ClusterStatusPublisher.MulticastPublisher.ClusterStatusEncoder</a></li>
 <li><a 
href="ClusterStatusPublisher.MulticastPublisher.HBaseDatagramChannelFactory.html"
 title="class in org.apache.hadoop.hbase.master" 
target="classFrame">ClusterStatusPublisher.MulticastPublisher.HBaseDatagramChannelFactory</a></li>
 <li><a href="DeadServer.html" title="class in org.apache.hadoop.hbase.master" 
target="classFrame">DeadServer</a></li>
+<li><a href="DrainingServerTracker.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">DrainingServerTracker</a></li>
 <li><a href="ExpiredMobFileCleanerChore.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">ExpiredMobFileCleanerChore</a></li>
 <li><a href="HMaster.html" title="class in org.apache.hadoop.hbase.master" 
target="classFrame">HMaster</a></li>
 <li><a href="HMaster.InitializationMonitor.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">HMaster.InitializationMonitor</a></li>
@@ -81,12 +82,15 @@
 <li><a href="RegionPlacementMaintainer.RandomizedMatrix.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">RegionPlacementMaintainer.RandomizedMatrix</a></li>
 <li><a href="RegionPlan.html" title="class in org.apache.hadoop.hbase.master" 
target="classFrame">RegionPlan</a></li>
 <li><a href="RegionPlan.RegionPlanComparator.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">RegionPlan.RegionPlanComparator</a></li>
+<li><a href="RegionServerTracker.html" title="class in 
org.apache.hadoop.hbase.master" target="classFrame">RegionServerTracker</a></li>
 <li><a href="RegionState.html" title="class in org.apache.hadoop.hbase.master" 
target="classFrame">RegionState</a></li>
 <li><a href="ServerManager.html" title="class in 
org.apache.hadoop.hbase.master" target="classFrame">ServerManager</a></li>
 <li><a href="SnapshotOfRegionAssignmentFromMeta.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">SnapshotOfRegionAssignmentFromMeta</a></li>
 <li><a href="SplitLogManager.html" title="class in 
org.apache.hadoop.hbase.master" target="classFrame">SplitLogManager</a></li>
 <li><a href="SplitLogManager.Task.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">SplitLogManager.Task</a></li>
 <li><a href="SplitLogManager.TaskBatch.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">SplitLogManager.TaskBatch</a></li>
+<li><a href="SplitOrMergeTracker.html" title="class in 
org.apache.hadoop.hbase.master" target="classFrame">SplitOrMergeTracker</a></li>
+<li><a href="SplitOrMergeTracker.SwitchStateTracker.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">SplitOrMergeTracker.SwitchStateTracker</a></li>
 <li><a href="TableNamespaceManager.html" title="class in 
org.apache.hadoop.hbase.master" 
target="classFrame">TableNamespaceManager</a></li>
 <li><a href="TableStateManager.html" title="class in 
org.apache.hadoop.hbase.master" target="classFrame">TableStateManager</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/package-summary.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-summary.html 
b/devapidocs/org/apache/hadoop/hbase/master/package-summary.html
index 4c4f4a8..2fb799a 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-summary.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-summary.html
@@ -250,67 +250,73 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/DrainingServerTracker.html" 
title="class in org.apache.hadoop.hbase.master">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/master/ExpiredMobFileCleanerChore.html"
 title="class in 
org.apache.hadoop.hbase.master">ExpiredMobFileCleanerChore</a></td>
 <td class="colLast">
 <div class="block">The Class ExpiredMobFileCleanerChore for running cleaner 
regularly to remove the expired
  mob files.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class 
in org.apache.hadoop.hbase.master">HMaster</a></td>
 <td class="colLast">
 <div class="block">HMaster is the "master server" for HBase.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html"
 title="class in 
org.apache.hadoop.hbase.master">HMaster.InitializationMonitor</a></td>
 <td class="colLast">
 <div class="block">Protection against zombie master.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html"
 title="class in 
org.apache.hadoop.hbase.master">HMaster.RedirectServlet</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/HMasterCommandLine.html" 
title="class in org.apache.hadoop.hbase.master">HMasterCommandLine</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/HMasterCommandLine.LocalHMaster.html"
 title="class in 
org.apache.hadoop.hbase.master">HMasterCommandLine.LocalHMaster</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterAnnotationReadingPriorityFunction.html"
 title="class in 
org.apache.hadoop.hbase.master">MasterAnnotationReadingPriorityFunction</a></td>
 <td class="colLast">
 <div class="block">Priority function specifically for the master.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.html" 
title="class in org.apache.hadoop.hbase.master">MasterCoprocessorHost</a></td>
 <td class="colLast">
 <div class="block">Provides the coprocessor framework and environment for 
master oriented
  operations.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.MasterEnvironment.html"
 title="class in 
org.apache.hadoop.hbase.master">MasterCoprocessorHost.MasterEnvironment</a></td>
 <td class="colLast">
 <div class="block">Coprocessor environment extension providing access to 
master related
  services.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterCoprocessorHost.MasterEnvironmentForCoreCoprocessors.html"
 title="class in 
org.apache.hadoop.hbase.master">MasterCoprocessorHost.MasterEnvironmentForCoreCoprocessors</a></td>
 <td class="colLast">
 <div class="block">Special version of MasterEnvironment that exposes 
MasterServices for Core Coprocessors only.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterDumpServlet.html" 
title="class in org.apache.hadoop.hbase.master">MasterDumpServlet</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterFileSystem.html" 
title="class in org.apache.hadoop.hbase.master">MasterFileSystem</a></td>
 <td class="colLast">
 <div class="block">This class abstracts a bunch of operations the HMaster 
needs to interact with
@@ -318,132 +324,132 @@
  system status, etc.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterMetaBootstrap.html" 
title="class in org.apache.hadoop.hbase.master">MasterMetaBootstrap</a></td>
 <td class="colLast">
 <div class="block">Used by the HMaster on startup to split meta logs and 
assign the meta table.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterMobCompactionThread.html"
 title="class in 
org.apache.hadoop.hbase.master">MasterMobCompactionThread</a></td>
 <td class="colLast">
 <div class="block">The mob compaction thread used in <a 
href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.html" 
title="class in 
org.apache.hadoop.hbase.master"><code>MasterRpcServices</code></a></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.html" 
title="class in org.apache.hadoop.hbase.master">MasterRpcServices</a></td>
 <td class="colLast">
 <div class="block">Implements the master RPC services.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterStatusServlet.html" 
title="class in org.apache.hadoop.hbase.master">MasterStatusServlet</a></td>
 <td class="colLast">
 <div class="block">The servlet responsible for rendering the index page of the
  master.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MasterWalManager.html" 
title="class in org.apache.hadoop.hbase.master">MasterWalManager</a></td>
 <td class="colLast">
 <div class="block">This class abstracts a bunch of operations the HMaster needs
  when splitting log files e.g.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsAssignmentManager.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsAssignmentManager</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsAssignmentManagerSourceImpl</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMaster.html" 
title="class in org.apache.hadoop.hbase.master">MetricsMaster</a></td>
 <td class="colLast">
 <div class="block">This class is for maintaining the various master statistics
  and publishing them through the metrics interfaces.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterFileSystem.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterFileSystem</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterFilesystemSourceImpl</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterProcSourceFactoryImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterProcSourceFactoryImpl</a></td>
 <td class="colLast">
 <div class="block">Factory to create MetricsMasterProcSource when given a 
MetricsMasterWrapper</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterProcSourceImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterProcSourceImpl</a></td>
 <td class="colLast">
 <div class="block">Hadoop2 implementation of MetricsMasterSource.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceFactoryImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterQuotaSourceFactoryImpl</a></td>
 <td class="colLast">
 <div class="block">Factory to create MetricsMasterQuotaSource instances when 
given a MetricsMasterWrapper.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterQuotaSourceImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterQuotaSourceImpl</a></td>
 <td class="colLast">
 <div class="block">Implementation of <a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterQuotaSource.html"
 title="interface in 
org.apache.hadoop.hbase.master"><code>MetricsMasterQuotaSource</code></a> which 
writes the values passed in via the
  interface to the metrics backend.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterSourceFactoryImpl</a></td>
 <td class="colLast">
 <div class="block">Factory to create MetricsMasterSource when given a  
MetricsMasterWrapper</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterSourceImpl</a></td>
 <td class="colLast">
 <div class="block">Hadoop2 implementation of MetricsMasterSource.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsMasterWrapperImpl</a></td>
 <td class="colLast">
 <div class="block">Impl for exposing HMaster Information through JMX</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsSnapshot.html" 
title="class in org.apache.hadoop.hbase.master">MetricsSnapshot</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.html"
 title="class in 
org.apache.hadoop.hbase.master">MetricsSnapshotSourceImpl</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/MobCompactionChore.html" 
title="class in org.apache.hadoop.hbase.master">MobCompactionChore</a></td>
 <td class="colLast">
 <div class="block">The Class MobCompactChore for running compaction regularly 
to merge small mob files.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/RackManager.html" 
title="class in org.apache.hadoop.hbase.master">RackManager</a></td>
 <td class="colLast">
 <div class="block">Wrapper over the rack resolution utility in Hadoop.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionPlacementMaintainer.html"
 title="class in 
org.apache.hadoop.hbase.master">RegionPlacementMaintainer</a></td>
 <td class="colLast">
 <div class="block">A tool that is used for manipulating and viewing favored 
nodes information
  for regions.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionPlacementMaintainer.RandomizedMatrix.html"
 title="class in 
org.apache.hadoop.hbase.master">RegionPlacementMaintainer.RandomizedMatrix</a></td>
 <td class="colLast">
 <div class="block">Some algorithms for solving the assignment problem may 
traverse workers or
@@ -452,16 +458,22 @@
  costs are uniform.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionPlan.html" 
title="class in org.apache.hadoop.hbase.master">RegionPlan</a></td>
 <td class="colLast">
 <div class="block">Stores the plan for the move of an individual region.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionPlan.RegionPlanComparator.html"
 title="class in 
org.apache.hadoop.hbase.master">RegionPlan.RegionPlanComparator</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionServerTracker.html" 
title="class in org.apache.hadoop.hbase.master">RegionServerTracker</a></td>
+<td class="colLast">
+<div class="block">Tracks the online region servers via ZK.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/RegionState.html" 
title="class in org.apache.hadoop.hbase.master">RegionState</a></td>
 <td class="colLast">
@@ -498,6 +510,16 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/SplitOrMergeTracker.html" 
title="class in org.apache.hadoop.hbase.master">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/master/SplitOrMergeTracker.SwitchStateTracker.html"
 title="class in 
org.apache.hadoop.hbase.master">SplitOrMergeTracker.SwitchStateTracker</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/master/TableNamespaceManager.html" 
title="class in org.apache.hadoop.hbase.master">TableNamespaceManager</a></td>
 <td class="colLast">
 <div class="block">This is a helper class used internally to manage the 
namespace metadata that is stored in

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 5213a25..db3e637 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -222,6 +222,7 @@
 <li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.html" 
title="class in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitLogManager</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.Task.html" 
title="class in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitLogManager.Task</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TaskBatch.html"
 title="class in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitLogManager.TaskBatch</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.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/TableNamespaceManager.html" 
title="class in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">TableNamespaceManager</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/TableStateManager.html" 
title="class in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">TableStateManager</span></a></li>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Throwable</span></a> (implements 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>)
@@ -242,9 +243,16 @@
 </li>
 </ul>
 </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.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.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.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.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.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>
 </ul>
 </li>
 </ul>
@@ -324,11 +332,11 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, 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>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html"
 title="enum in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html"
 title="enum in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html"
 title="enum in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html"
 title="enum in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html"
 title="enum in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" 
title="enum in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">RegionState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a 
href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html"
 title="enum in org.apache.hadoop.hbase.master"><span 
class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/package-use.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-use.html 
b/devapidocs/org/apache/hadoop/hbase/master/package-use.html
index f9dbde7..9b11e84 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-use.html
@@ -380,142 +380,152 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/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/master/class-use/ExpiredMobFileCleanerChore.html#org.apache.hadoop.hbase.master">ExpiredMobFileCleanerChore</a>
 <div class="block">The Class ExpiredMobFileCleanerChore for running cleaner 
regularly to remove the expired
  mob files.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/HMaster.html#org.apache.hadoop.hbase.master">HMaster</a>
 <div class="block">HMaster is the "master server" for HBase.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/LoadBalancer.html#org.apache.hadoop.hbase.master">LoadBalancer</a>
 <div class="block">Makes decisions about the placement and movement of Regions 
across
  RegionServers.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterCoprocessorHost.html#org.apache.hadoop.hbase.master">MasterCoprocessorHost</a>
 <div class="block">Provides the coprocessor framework and environment for 
master oriented
  operations.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterCoprocessorHost.MasterEnvironment.html#org.apache.hadoop.hbase.master">MasterCoprocessorHost.MasterEnvironment</a>
 <div class="block">Coprocessor environment extension providing access to 
master related
  services.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterFileSystem.html#org.apache.hadoop.hbase.master">MasterFileSystem</a>
 <div class="block">This class abstracts a bunch of operations the HMaster 
needs to interact with
  the underlying file system like creating the initial layout, checking file
  system status, etc.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterMetaBootstrap.html#org.apache.hadoop.hbase.master">MasterMetaBootstrap</a>
 <div class="block">Used by the HMaster on startup to split meta logs and 
assign the meta table.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterMobCompactionThread.html#org.apache.hadoop.hbase.master">MasterMobCompactionThread</a>
 <div class="block">The mob compaction thread used in <a 
href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.html" 
title="class in 
org.apache.hadoop.hbase.master"><code>MasterRpcServices</code></a></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterRpcServices.html#org.apache.hadoop.hbase.master">MasterRpcServices</a>
 <div class="block">Implements the master RPC services.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterRpcServices.BalanceSwitchMode.html#org.apache.hadoop.hbase.master">MasterRpcServices.BalanceSwitchMode</a>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterServices.html#org.apache.hadoop.hbase.master">MasterServices</a>
 <div class="block">A curated subset of services provided by <a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class 
in org.apache.hadoop.hbase.master"><code>HMaster</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterWalManager.html#org.apache.hadoop.hbase.master">MasterWalManager</a>
 <div class="block">This class abstracts a bunch of operations the HMaster needs
  when splitting log files e.g.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsAssignmentManagerSource.html#org.apache.hadoop.hbase.master">MetricsAssignmentManagerSource</a>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMaster.html#org.apache.hadoop.hbase.master">MetricsMaster</a>
 <div class="block">This class is for maintaining the various master statistics
  and publishing them through the metrics interfaces.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterFileSystem.html#org.apache.hadoop.hbase.master">MetricsMasterFileSystem</a>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterFileSystemSource.html#org.apache.hadoop.hbase.master">MetricsMasterFileSystemSource</a>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterProcSource.html#org.apache.hadoop.hbase.master">MetricsMasterProcSource</a>
 <div class="block">Interface that classes that expose metrics about the master 
will implement.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterProcSourceFactory.html#org.apache.hadoop.hbase.master">MetricsMasterProcSourceFactory</a>
 <div class="block">Interface of a factory to create MetricsMasterSource when 
given a MetricsMasterWrapper</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterQuotaSource.html#org.apache.hadoop.hbase.master">MetricsMasterQuotaSource</a>
 <div class="block">A collection of exposed metrics for space quotas from the 
HBase Master.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterQuotaSourceFactory.html#org.apache.hadoop.hbase.master">MetricsMasterQuotaSourceFactory</a>
 <div class="block">Interface of a factory to create MetricsMasterQuotaSource 
when given a MetricsMasterWrapper.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterSource.html#org.apache.hadoop.hbase.master">MetricsMasterSource</a>
 <div class="block">Interface that classes that expose metrics about the master 
will implement.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterSourceFactory.html#org.apache.hadoop.hbase.master">MetricsMasterSourceFactory</a>
 <div class="block">Interface of a factory to create MetricsMasterSource when 
given a MetricsMasterWrapper</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterSourceFactoryImpl.FactoryStorage.html#org.apache.hadoop.hbase.master">MetricsMasterSourceFactoryImpl.FactoryStorage</a>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsMasterWrapper.html#org.apache.hadoop.hbase.master">MetricsMasterWrapper</a>
 <div class="block">This is the interface that will expose information to 
hadoop1/hadoop2 implementations of the
  MetricsMasterSource.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MetricsSnapshotSource.html#org.apache.hadoop.hbase.master">MetricsSnapshotSource</a>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MobCompactionChore.html#org.apache.hadoop.hbase.master">MobCompactionChore</a>
 <div class="block">The Class MobCompactChore for running compaction regularly 
to merge small mob files.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/RackManager.html#org.apache.hadoop.hbase.master">RackManager</a>
 <div class="block">Wrapper over the rack resolution utility in Hadoop.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/RegionPlan.html#org.apache.hadoop.hbase.master">RegionPlan</a>
 <div class="block">Stores the plan for the move of an individual region.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/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/master/class-use/RegionState.html#org.apache.hadoop.hbase.master">RegionState</a>
 <div class="block">State of a Region while undergoing transitions.</div>
@@ -565,6 +575,14 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/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>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/SplitOrMergeTracker.SwitchStateTracker.html#org.apache.hadoop.hbase.master">SplitOrMergeTracker.SwitchStateTracker</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/TableNamespaceManager.html#org.apache.hadoop.hbase.master">TableNamespaceManager</a>
 <div class="block">This is a helper class used internally to manage the 
namespace metadata that is stored in
  TableName.NAMESPACE_TABLE_NAME.</div>
@@ -987,20 +1005,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/MasterServices.html#org.apache.hadoop.hbase.zookeeper">MasterServices</a>
-<div class="block">A curated subset of services provided by <a 
href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class 
in org.apache.hadoop.hbase.master"><code>HMaster</code></a>.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/RegionState.html#org.apache.hadoop.hbase.zookeeper">RegionState</a>
 <div class="block">State of a Region while undergoing transitions.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/RegionState.State.html#org.apache.hadoop.hbase.zookeeper">RegionState.State</a>&nbsp;</td>
-</tr>
 <tr class="rowColor">
-<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/ServerManager.html#org.apache.hadoop.hbase.zookeeper">ServerManager</a>&nbsp;</td>
+<td class="colOne"><a 
href="../../../../../org/apache/hadoop/hbase/master/class-use/RegionState.State.html#org.apache.hadoop.hbase.zookeeper">RegionState.State</a>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/master/replication/ReplicationManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/replication/ReplicationManager.html 
b/devapidocs/org/apache/hadoop/hbase/master/replication/ReplicationManager.html
index 397b71e..caf2968 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/master/replication/ReplicationManager.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/replication/ReplicationManager.html
@@ -145,7 +145,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/replication/ReplicationManager.html#replicationQueuesClient">replicationQueuesClient</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html"
 title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a></code></td>
+<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/replication/ReplicationManager.html#zkw">zkw</a></span></code>&nbsp;</td>
 </tr>
 </table>
@@ -163,8 +163,8 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><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="colOne"><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>
 </table>
@@ -261,7 +261,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>zkw</h4>
-<pre>private final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html"
 title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/replication/ReplicationManager.html#line.52">zkw</a></pre>
+<pre>private final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/replication/ReplicationManager.html#line.52">zkw</a></pre>
 </li>
 </ul>
 <a name="replicationQueuesClient">
@@ -290,14 +290,14 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="ReplicationManager-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-org.apache.hadoop.hbase.Abortable-">
+<a 
name="ReplicationManager-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.zookeeper.ZKWatcher-org.apache.hadoop.hbase.Abortable-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ReplicationManager</h4>
 <pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/replication/ReplicationManager.html#line.56">ReplicationManager</a>(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,
+                          <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)
                    throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 8d36771..cd9b22e 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -338,12 +338,12 @@
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/Version.html" title="class in 
org.apache.hadoop.hbase"><span class="typeNameLink">Version</span></a></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/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.<a 
href="../../../../org/apache/hadoop/hbase/ZKNamespaceManager.html" title="class 
in org.apache.hadoop.hbase"><span 
class="typeNameLink">ZKNamespaceManager</span></a></li>
 </ul>
 </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>
 </ul>
 </li>
 </ul>
@@ -434,19 +434,19 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, 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>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">MemoryCompactionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">CellBuilderType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">MetaTableAccessor.QueryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">KeepDeletedCells</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/ProcedureState.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">ProcedureState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/ClusterStatus.Option.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">ClusterStatus.Option</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">KeepDeletedCells</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">MemoryCompactionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">CompareOperator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/CellBuilder.DataType.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">CellBuilder.DataType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">MetaTableAccessor.QueryType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum 
in org.apache.hadoop.hbase"><span 
class="typeNameLink">Coprocessor.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">KeyValue.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">CellBuilderType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/CellBuilder.DataType.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">CellBuilder.DataType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in 
org.apache.hadoop.hbase"><span 
class="typeNameLink">CompareOperator</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html 
b/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html
index 35614ca..63d17a8 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html
@@ -153,7 +153,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureCo
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html#procedureType">procedureType</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>(package private) <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a></code></td>
+<td class="colFirst"><code>(package private) <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html#watcher">watcher</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
@@ -175,7 +175,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureCo
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html#ZKProcedureCoordinator-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-java.lang.String-java.lang.String-">ZKProcedureCoordinator</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="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html#ZKProcedureCoordinator-org.apache.hadoop.hbase.zookeeper.ZKWatcher-java.lang.String-java.lang.String-">ZKProcedureCoordinator</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;procedureClass,
                       <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;coordName)</code>&nbsp;</td>
 </tr>
@@ -303,7 +303,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureCo
 <ul class="blockList">
 <li class="blockList">
 <h4>watcher</h4>
-<pre><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html#line.44">watcher</a></pre>
+<pre><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZKWatcher</a> <a 
href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html#line.44">watcher</a></pre>
 </li>
 </ul>
 <a name="procedureType">
@@ -332,13 +332,13 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureCo
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="ZKProcedureCoordinator-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-java.lang.String-java.lang.String-">
+<a 
name="ZKProcedureCoordinator-org.apache.hadoop.hbase.zookeeper.ZKWatcher-java.lang.String-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ZKProcedureCoordinator</h4>
-<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html#line.55">ZKProcedureCoordinator</a>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinator.html#line.55">ZKProcedureCoordinator</a>(<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;procedureClass,
                               <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;coordName)</pre>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html 
b/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
index 478feca..b5f1414 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
@@ -182,7 +182,7 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#ZKProcedureMemberRpcs-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-java.lang.String-">ZKProcedureMemberRpcs</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="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#ZKProcedureMemberRpcs-org.apache.hadoop.hbase.zookeeper.ZKWatcher-java.lang.String-">ZKProcedureMemberRpcs</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;procType)</code>
 <div class="block">Must call <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#start-java.lang.String-org.apache.hadoop.hbase.procedure.ProcedureMember-"><code>start(String,
 ProcedureMember)</code></a> before this can be used.</div>
 </td>
@@ -336,19 +336,19 @@ implements <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="ZKProcedureMemberRpcs-org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher-java.lang.String-">
+<a 
name="ZKProcedureMemberRpcs-org.apache.hadoop.hbase.zookeeper.ZKWatcher-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ZKProcedureMemberRpcs</h4>
-<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.69">ZKProcedureMemberRpcs</a>(<a
 href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.69">ZKProcedureMemberRpcs</a>(<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;procType)
                       throws org.apache.zookeeper.KeeperException</pre>
 <div class="block">Must call <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#start-java.lang.String-org.apache.hadoop.hbase.procedure.ProcedureMember-"><code>start(String,
 ProcedureMember)</code></a> before this can be used.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>watcher</code> - <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in 
org.apache.hadoop.hbase.zookeeper"><code>ZooKeeperWatcher</code></a> to be 
owned by <tt>this</tt>. Closed via
+<dd><code>watcher</code> - <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper"><code>ZKWatcher</code></a> 
to be owned by <tt>this</tt>. Closed via
           <a 
href="../../../../../org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#close--"><code>close()</code></a>.</dd>
 <dd><code>procType</code> - name of the znode describing the procedure 
type</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>

Reply via email to