You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2015/12/10 18:12:35 UTC
[13/51] [partial] hbase-site git commit: Published site at
26ac60b03f80c9215103a02db783341e67037753.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKConfig.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKConfig.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKConfig.html
index ed4dd55..6d58b56 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKConfig.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKConfig.html
@@ -36,7 +36,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKClusterId.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/hadoop/hbase/zookeeper/ZKConfig.html" target="_top">Frames</a></li>
@@ -60,7 +60,7 @@
<div>
<ul class="subNavList">
<li>Summary: </li>
-<li>Nested | </li>
+<li><a href="#nested_class_summary">Nested</a> | </li>
<li><a href="#field_summary">Field</a> | </li>
<li><a href="#constructor_summary">Constr</a> | </li>
<li><a href="#method_summary">Method</a></li>
@@ -96,7 +96,7 @@
<hr>
<br>
<pre><a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html" title="annotation in org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.36">ZKConfig</a>
+public final class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.38">ZKConfig</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Utility methods for reading, and building the ZooKeeper configuration.
@@ -109,6 +109,25 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="summary">
<ul class="blockList">
<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested_class_summary">
+<!-- -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class </code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKConfig.ZKClusterKey</a></strong></code> </td>
+</tr>
+</table>
+</li>
+</ul>
<!-- =========== FIELD SUMMARY =========== -->
<ul class="blockList">
<li class="blockList"><a name="field_summary">
@@ -137,10 +156,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier</th>
+<th class="colLast" scope="col">Constructor and Description</th>
</tr>
<tr class="altColor">
-<td class="colOne"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#ZKConfig()">ZKConfig</a></strong>()</code> </td>
+<td class="colFirst"><code>private </code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#ZKConfig()">ZKConfig</a></strong>()</code> </td>
</tr>
</table>
</li>
@@ -159,8 +180,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#buildQuorumServerString(java.lang.String[],%20java.lang.String)">buildQuorumServerString</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] serverHosts,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> clientPort)</code>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#buildZKQuorumServerString(java.lang.String[],%20java.lang.String)">buildZKQuorumServerString</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] serverHosts,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> clientPort)</code>
<div class="block">Build the ZK quorum server string with "server:clientport" list, separated by ','</div>
</td>
</tr>
@@ -177,6 +198,21 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#getZooKeeperClusterKey(org.apache.hadoop.conf.Configuration)">getZooKeeperClusterKey</a></strong>(org.apache.hadoop.conf.Configuration conf)</code>
+<div class="block">Get the key to the ZK ensemble for this configuration without
+ adding a name at the end</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#getZooKeeperClusterKey(org.apache.hadoop.conf.Configuration,%20java.lang.String)">getZooKeeperClusterKey</a></strong>(org.apache.hadoop.conf.Configuration conf,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
+<div class="block">Get the key to the ZK ensemble for this configuration and append
+ a name at the end</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#makeZKProps(org.apache.hadoop.conf.Configuration)">makeZKProps</a></strong>(org.apache.hadoop.conf.Configuration conf)</code>
<div class="block">Make a Properties object holding ZooKeeper config.</div>
@@ -188,6 +224,27 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="block">Make a Properties object holding ZooKeeper config.</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#standardizeZKQuorumServerString(java.lang.String,%20java.lang.String)">standardizeZKQuorumServerString</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> quorumStringInput,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> clientPort)</code>
+<div class="block">Standardize the ZK quorum string: make it a "server:clientport" list, separated by ','</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKConfig.ZKClusterKey</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#transformClusterKey(java.lang.String)">transformClusterKey</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)</code>
+<div class="block">Separate the given key into the three configurations it should contain:
+ hbase.zookeeper.quorum, hbase.zookeeper.client.port
+ and zookeeper.znode.parent</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html#validateClusterKey(java.lang.String)">validateClusterKey</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)</code>
+<div class="block">Verifies that the given key matches the expected format for a ZooKeeper cluster key.</div>
+</td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
@@ -216,7 +273,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>VARIABLE_START</h4>
-<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.38">VARIABLE_START</a></pre>
+<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.40">VARIABLE_START</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.zookeeper.ZKConfig.VARIABLE_START">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -234,7 +291,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>ZKConfig</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.36">ZKConfig</a>()</pre>
+<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.42">ZKConfig</a>()</pre>
</li>
</ul>
</li>
@@ -251,7 +308,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>makeZKProps</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.47">makeZKProps</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.52">makeZKProps</a>(org.apache.hadoop.conf.Configuration conf)</pre>
<div class="block">Make a Properties object holding ZooKeeper config.
Parses the corresponding config options from the HBase XML configs
and generates the appropriate ZooKeeper properties.</div>
@@ -265,7 +322,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>makeZKPropsFromHbaseConfig</h4>
-<pre>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.59">makeZKPropsFromHbaseConfig</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.64">makeZKPropsFromHbaseConfig</a>(org.apache.hadoop.conf.Configuration conf)</pre>
<div class="block">Make a Properties object holding ZooKeeper config.
Parses the corresponding config options from the HBase XML configs
and generates the appropriate ZooKeeper properties.</div>
@@ -279,34 +336,115 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getZKQuorumServersStringFromHbaseConfig</h4>
-<pre>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.114">getZKQuorumServersStringFromHbaseConfig</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.119">getZKQuorumServersStringFromHbaseConfig</a>(org.apache.hadoop.conf.Configuration conf)</pre>
<div class="block">Return the ZK Quorum servers string given the specified configuration</div>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>conf</code> - </dd>
<dt><span class="strong">Returns:</span></dt><dd>Quorum servers String</dd></dl>
</li>
</ul>
-<a name="buildQuorumServerString(java.lang.String[], java.lang.String)">
+<a name="getZKQuorumServersString(org.apache.hadoop.conf.Configuration)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>buildQuorumServerString</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.131">buildQuorumServerString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] serverHosts,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> clientPort)</pre>
+<h4>getZKQuorumServersString</h4>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.133">getZKQuorumServersString</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<div class="block">Return the ZK Quorum servers string given the specified configuration.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>Quorum servers</dd></dl>
+</li>
+</ul>
+<a name="buildZKQuorumServerString(java.lang.String[], java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>buildZKQuorumServerString</h4>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.144">buildZKQuorumServerString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] serverHosts,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> clientPort)</pre>
<div class="block">Build the ZK quorum server string with "server:clientport" list, separated by ','</div>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>serverHosts</code> - a list of servers for ZK quorum</dd><dd><code>clientPort</code> - the default client port</dd>
<dt><span class="strong">Returns:</span></dt><dd>the string for a list of "server:port" separated by ","</dd></dl>
</li>
</ul>
-<a name="getZKQuorumServersString(org.apache.hadoop.conf.Configuration)">
+<a name="validateClusterKey(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>validateClusterKey</h4>
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.177">validateClusterKey</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)
+ throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Verifies that the given key matches the expected format for a ZooKeeper cluster key.
+ The Quorum for the ZK cluster can have one the following formats (see examples below):
+
+ <ol>
+ <li>s1,s2,s3 (no client port in the list, the client port could be obtained from
+ clientPort)</li>
+ <li>s1:p1,s2:p2,s3:p3 (with client port, which could be same or different for each server,
+ in this case, the clientPort would be ignored)</li>
+ <li>s1:p1,s2,s3:p3 (mix of (1) and (2) - if port is not specified in a server, it would use
+ the clientPort; otherwise, it would use the specified port)</li>
+ </ol></div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>key</code> - the cluster key to validate</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - if the key could not be parsed</dd></dl>
+</li>
+</ul>
+<a name="transformClusterKey(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>transformClusterKey</h4>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKConfig.ZKClusterKey</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.189">transformClusterKey</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)
+ throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Separate the given key into the three configurations it should contain:
+ hbase.zookeeper.quorum, hbase.zookeeper.client.port
+ and zookeeper.znode.parent</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>key</code> - </dd>
+<dt><span class="strong">Returns:</span></dt><dd>the three configuration in the described order</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
+</li>
+</ul>
+<a name="getZooKeeperClusterKey(org.apache.hadoop.conf.Configuration)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getZooKeeperClusterKey</h4>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.232">getZooKeeperClusterKey</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<div class="block">Get the key to the ZK ensemble for this configuration without
+ adding a name at the end</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>conf</code> - Configuration to use to build the key</dd>
+<dt><span class="strong">Returns:</span></dt><dd>ensemble key without a name</dd></dl>
+</li>
+</ul>
+<a name="getZooKeeperClusterKey(org.apache.hadoop.conf.Configuration, java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getZooKeeperClusterKey</h4>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.243">getZooKeeperClusterKey</a>(org.apache.hadoop.conf.Configuration conf,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<div class="block">Get the key to the ZK ensemble for this configuration and append
+ a name at the end</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>conf</code> - Configuration to use to build the key</dd><dd><code>name</code> - Name that should be appended at the end if not empty or null</dd>
+<dt><span class="strong">Returns:</span></dt><dd>ensemble key with a name (if any)</dd></dl>
+</li>
+</ul>
+<a name="standardizeZKQuorumServerString(java.lang.String, java.lang.String)">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>getZKQuorumServersString</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.152">getZKQuorumServersString</a>(org.apache.hadoop.conf.Configuration conf)</pre>
-<div class="block">Return the ZK Quorum servers string given the specified configuration.</div>
-<dl><dt><span class="strong">Returns:</span></dt><dd>Quorum servers</dd></dl>
+<h4>standardizeZKQuorumServerString</h4>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKConfig.html#line.265">standardizeZKQuorumServerString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> quorumStringInput,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> clientPort)</pre>
+<div class="block">Standardize the ZK quorum string: make it a "server:clientport" list, separated by ','</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>quorumStringInput</code> - a string contains a list of servers for ZK quorum</dd><dd><code>clientPort</code> - the default client port</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the string for a list of "server:port" separated by ","</dd></dl>
</li>
</ul>
</li>
@@ -336,7 +474,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKClusterId.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/hadoop/hbase/zookeeper/ZKConfig.html" target="_top">Frames</a></li>
@@ -360,7 +498,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div>
<ul class="subNavList">
<li>Summary: </li>
-<li>Nested | </li>
+<li><a href="#nested_class_summary">Nested</a> | </li>
<li><a href="#field_summary">Field</a> | </li>
<li><a href="#constructor_summary">Constr</a> | </li>
<li><a href="#method_summary">Method</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html
index 294b60a..5ae03b4 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html
@@ -35,7 +35,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKServerTool.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -471,7 +471,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperListe
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKConfig.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKServerTool.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html
index 75703fb..9b84292 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html
@@ -104,7 +104,7 @@
</dl>
<hr>
<br>
-<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html#line.253">ZKUtil.JaasConfiguration</a>
+<pre>private static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html#line.234">ZKUtil.JaasConfiguration</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/Configuration.html?is-external=true" title="class or interface in javax.security.auth.login">Configuration</a></pre>
<div class="block">A JAAS configuration that defines the login modules that we want to use for login.</div>
</li>
@@ -266,7 +266,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>SERVER_KEYTAB_KERBEROS_CONFIG_NAME</h4>
-<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.254">SERVER_KEYTAB_KERBEROS_CONFIG_NAME</a></pre>
+<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.235">SERVER_KEYTAB_KERBEROS_CONFIG_NAME</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.zookeeper.ZKUtil.JaasConfiguration.SERVER_KEYTAB_KERBEROS_CONFIG_NAME">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -276,7 +276,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>CLIENT_KEYTAB_KERBEROS_CONFIG_NAME</h4>
-<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.256">CLIENT_KEYTAB_KERBEROS_CONFIG_NAME</a></pre>
+<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.237">CLIENT_KEYTAB_KERBEROS_CONFIG_NAME</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.zookeeper.ZKUtil.JaasConfiguration.CLIENT_KEYTAB_KERBEROS_CONFIG_NAME">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -286,7 +286,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>BASIC_JAAS_OPTIONS</h4>
-<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.259">BASIC_JAAS_OPTIONS</a></pre>
+<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.240">BASIC_JAAS_OPTIONS</a></pre>
</li>
</ul>
<a name="KEYTAB_KERBEROS_OPTIONS">
@@ -295,7 +295,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>KEYTAB_KERBEROS_OPTIONS</h4>
-<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.268">KEYTAB_KERBEROS_OPTIONS</a></pre>
+<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.249">KEYTAB_KERBEROS_OPTIONS</a></pre>
</li>
</ul>
<a name="KEYTAB_KERBEROS_LOGIN">
@@ -304,7 +304,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>KEYTAB_KERBEROS_LOGIN</h4>
-<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/AppConfigurationEntry.html?is-external=true" title="class or interface in javax.security.auth.login">AppConfigurationEntry</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.277">KEYTAB_KERBEROS_LOGIN</a></pre>
+<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/AppConfigurationEntry.html?is-external=true" title="class or interface in javax.security.auth.login">AppConfigurationEntry</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.258">KEYTAB_KERBEROS_LOGIN</a></pre>
</li>
</ul>
<a name="KEYTAB_KERBEROS_CONF">
@@ -313,7 +313,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>KEYTAB_KERBEROS_CONF</h4>
-<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/AppConfigurationEntry.html?is-external=true" title="class or interface in javax.security.auth.login">AppConfigurationEntry</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.282">KEYTAB_KERBEROS_CONF</a></pre>
+<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/AppConfigurationEntry.html?is-external=true" title="class or interface in javax.security.auth.login">AppConfigurationEntry</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.263">KEYTAB_KERBEROS_CONF</a></pre>
</li>
</ul>
<a name="baseConfig">
@@ -322,7 +322,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>baseConfig</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/Configuration.html?is-external=true" title="class or interface in javax.security.auth.login">Configuration</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.285">baseConfig</a></pre>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/Configuration.html?is-external=true" title="class or interface in javax.security.auth.login">Configuration</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.266">baseConfig</a></pre>
</li>
</ul>
<a name="loginContextName">
@@ -331,7 +331,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>loginContextName</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.286">loginContextName</a></pre>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.267">loginContextName</a></pre>
</li>
</ul>
<a name="useTicketCache">
@@ -340,7 +340,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>useTicketCache</h4>
-<pre>private final boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.287">useTicketCache</a></pre>
+<pre>private final boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.268">useTicketCache</a></pre>
</li>
</ul>
<a name="keytabFile">
@@ -349,7 +349,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>keytabFile</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.288">keytabFile</a></pre>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.269">keytabFile</a></pre>
</li>
</ul>
<a name="principal">
@@ -358,7 +358,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockListLast">
<li class="blockList">
<h4>principal</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.289">principal</a></pre>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.270">principal</a></pre>
</li>
</ul>
</li>
@@ -375,7 +375,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockList">
<li class="blockList">
<h4>ZKUtil.JaasConfiguration</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.291">ZKUtil.JaasConfiguration</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> loginContextName,
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.272">ZKUtil.JaasConfiguration</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> loginContextName,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> principal,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> keytabFile)</pre>
</li>
@@ -386,7 +386,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockListLast">
<li class="blockList">
<h4>ZKUtil.JaasConfiguration</h4>
-<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.295">ZKUtil.JaasConfiguration</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> loginContextName,
+<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.276">ZKUtil.JaasConfiguration</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> loginContextName,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> principal,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> keytabFile,
boolean useTicketCache)</pre>
@@ -406,7 +406,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/lo
<ul class="blockListLast">
<li class="blockList">
<h4>getAppConfigurationEntry</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/AppConfigurationEntry.html?is-external=true" title="class or interface in javax.security.auth.login">AppConfigurationEntry</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.312">getAppConfigurationEntry</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> appName)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/AppConfigurationEntry.html?is-external=true" title="class or interface in javax.security.auth.login">AppConfigurationEntry</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html#line.293">getAppConfigurationEntry</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> appName)</pre>
<dl>
<dt><strong>Specified by:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/Configuration.html?is-external=true#getAppConfigurationEntry(java.lang.String)" title="class or interface in javax.security.auth.login">getAppConfigurationEntry</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/Configuration.html?is-external=true" title="class or interface in javax.security.auth.login">Configuration</a></code></dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html
index 3235f1b..426b4c4 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html
@@ -36,7 +36,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html" target="_top">Frames</a></li>
@@ -103,7 +103,7 @@
</div>
<br>
<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html#line.647">ZKUtil.NodeAndData</a>
+public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html#line.524">ZKUtil.NodeAndData</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Simple class to hold a node path and node data.</div>
</li>
@@ -223,7 +223,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>node</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.648">node</a></pre>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.525">node</a></pre>
<div class="block"><span class="strong">Deprecated.</span> </div>
</li>
</ul>
@@ -233,7 +233,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>data</h4>
-<pre>private byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.649">data</a></pre>
+<pre>private byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.526">data</a></pre>
<div class="block"><span class="strong">Deprecated.</span> </div>
</li>
</ul>
@@ -251,7 +251,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>ZKUtil.NodeAndData</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.650">ZKUtil.NodeAndData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> node,
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.527">ZKUtil.NodeAndData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> node,
byte[] data)</pre>
<div class="block"><span class="strong">Deprecated.</span> </div>
</li>
@@ -270,7 +270,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getNode</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.654">getNode</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.531">getNode</a>()</pre>
<div class="block"><span class="strong">Deprecated.</span> </div>
</li>
</ul>
@@ -280,7 +280,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getData</h4>
-<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.657">getData</a>()</pre>
+<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.534">getData</a>()</pre>
<div class="block"><span class="strong">Deprecated.</span> </div>
</li>
</ul>
@@ -290,7 +290,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.661">toString</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.538">toString</a>()</pre>
<div class="block"><span class="strong">Deprecated.</span> </div>
<dl>
<dt><strong>Overrides:</strong></dt>
@@ -304,7 +304,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>isEmpty</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.664">isEmpty</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html#line.541">isEmpty</a>()</pre>
<div class="block"><span class="strong">Deprecated.</span> </div>
</li>
</ul>
@@ -335,7 +335,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.JaasConfiguration.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html
deleted file mode 100644
index fe80ca3..0000000
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ZKUtil.ZKClusterKey (Apache HBase 2.0.0-SNAPSHOT API)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-</head>
-<body>
-<script type="text/javascript"><!--
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ZKUtil.ZKClusterKey (Apache HBase 2.0.0-SNAPSHOT API)";
- }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar_top">
-<!-- -->
-</a><a href="#skip-navbar_top" title="Skip navigation links"></a><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 class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ZKUtil.ZKClusterKey.html">Use</a></li>
-<li><a href="package-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><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html" target="_top">Frames</a></li>
-<li><a href="ZKUtil.ZKClusterKey.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All 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>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li><a href="#field_summary">Field</a> | </li>
-<li><a href="#constructor_summary">Constr</a> | </li>
-<li><a href="#methods_inherited_from_class_java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li><a href="#field_detail">Field</a> | </li>
-<li><a href="#constructor_detail">Constr</a> | </li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip-navbar_top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.hadoop.hbase.zookeeper</div>
-<h2 title="Class ZKUtil.ZKClusterKey" class="title">Class ZKUtil.ZKClusterKey</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKClusterKey</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKUtil</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.html#line.106">ZKUtil.ZKClusterKey</a>
-extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field_summary">
-<!-- -->
-</a>
-<h3>Field Summary</h3>
-<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html#clientPort">clientPort</a></strong></code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html#quorumString">quorumString</a></strong></code> </td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html#znodeParent">znodeParent</a></strong></code> </td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor_summary">
-<!-- -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><strong><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html#ZKUtil.ZKClusterKey(java.lang.String,%20int,%20java.lang.String)">ZKUtil.ZKClusterKey</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> quorumString,
- int clientPort,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> znodeParent)</code> </td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method_summary">
-<!-- -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
-<!-- -->
-</a>
-<h3>Methods inherited from class java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll()" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)" title="class or interface in java.lang">wait</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field_detail">
-<!-- -->
-</a>
-<h3>Field Detail</h3>
-<a name="quorumString">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>quorumString</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html#line.107">quorumString</a></pre>
-</li>
-</ul>
-<a name="clientPort">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>clientPort</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html#line.108">clientPort</a></pre>
-</li>
-</ul>
-<a name="znodeParent">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>znodeParent</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html#line.109">znodeParent</a></pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor_detail">
-<!-- -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ZKUtil.ZKClusterKey(java.lang.String, int, java.lang.String)">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ZKUtil.ZKClusterKey</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html#line.111">ZKUtil.ZKClusterKey</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> quorumString,
- int clientPort,
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> znodeParent)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar_bottom">
-<!-- -->
-</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><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 class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ZKUtil.ZKClusterKey.html">Use</a></li>
-<li><a href="package-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><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.NodeAndData.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Prev Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" title="class in org.apache.hadoop.hbase.zookeeper"><span class="strong">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKClusterKey.html" target="_top">Frames</a></li>
-<li><a href="ZKUtil.ZKClusterKey.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All 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>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li><a href="#field_summary">Field</a> | </li>
-<li><a href="#constructor_summary">Constr</a> | </li>
-<li><a href="#methods_inherited_from_class_java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li><a href="#field_detail">Field</a> | </li>
-<li><a href="#constructor_detail">Constr</a> | </li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip-navbar_bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2007–2015 <a href="http://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/f68717a0/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html
index e1d9037..6ecded3 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html
@@ -104,7 +104,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html#line.1655">ZKUtil.ZKUtilOp.CreateAndFailSilent</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html#line.1532">ZKUtil.ZKUtilOp.CreateAndFailSilent</a>
extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKUtil.ZKUtilOp</a></pre>
<div class="block">ZKUtilOp representing createAndFailSilent in ZooKeeper
(attempt to create node, ignore error if already exists)</div>
@@ -227,7 +227,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockListLast">
<li class="blockList">
<h4>data</h4>
-<pre>private byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1656">data</a></pre>
+<pre>private byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1533">data</a></pre>
</li>
</ul>
</li>
@@ -244,7 +244,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockListLast">
<li class="blockList">
<h4>ZKUtil.ZKUtilOp.CreateAndFailSilent</h4>
-<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1658">ZKUtil.ZKUtilOp.CreateAndFailSilent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
+<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1535">ZKUtil.ZKUtilOp.CreateAndFailSilent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
byte[] data)</pre>
</li>
</ul>
@@ -262,7 +262,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockList">
<li class="blockList">
<h4>getData</h4>
-<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1663">getData</a>()</pre>
+<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1540">getData</a>()</pre>
</li>
</ul>
<a name="equals(java.lang.Object)">
@@ -271,7 +271,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1668">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1545">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<dl>
<dt><strong>Overrides:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="class or interface in java.lang">equals</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -284,7 +284,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockListLast">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1677">hashCode</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.CreateAndFailSilent.html#line.1554">hashCode</a>()</pre>
<dl>
<dt><strong>Overrides:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="class or interface in java.lang">hashCode</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html
index 52a988d..0b64d4b 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html
@@ -104,7 +104,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html#line.1687">ZKUtil.ZKUtilOp.DeleteNodeFailSilent</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html#line.1564">ZKUtil.ZKUtilOp.DeleteNodeFailSilent</a>
extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKUtil.ZKUtilOp</a></pre>
<div class="block">ZKUtilOp representing deleteNodeFailSilent in ZooKeeper
(attempt to delete node, ignore error if node doesn't exist)</div>
@@ -203,7 +203,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockListLast">
<li class="blockList">
<h4>ZKUtil.ZKUtilOp.DeleteNodeFailSilent</h4>
-<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html#line.1688">ZKUtil.ZKUtilOp.DeleteNodeFailSilent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</pre>
+<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html#line.1565">ZKUtil.ZKUtilOp.DeleteNodeFailSilent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</pre>
</li>
</ul>
</li>
@@ -220,7 +220,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html#line.1693">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html#line.1570">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<dl>
<dt><strong>Overrides:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="class or interface in java.lang">equals</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -233,7 +233,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockListLast">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html#line.1701">hashCode</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.DeleteNodeFailSilent.html#line.1578">hashCode</a>()</pre>
<dl>
<dt><strong>Overrides:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="class or interface in java.lang">hashCode</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f68717a0/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html
index 7d30354..57f9ff3 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html
@@ -104,7 +104,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html#line.1709">ZKUtil.ZKUtilOp.SetData</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html#line.1586">ZKUtil.ZKUtilOp.SetData</a>
extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKUtil.ZKUtilOp</a></pre>
<div class="block">ZKUtilOp representing setData in ZooKeeper</div>
</li>
@@ -226,7 +226,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockListLast">
<li class="blockList">
<h4>data</h4>
-<pre>private byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1710">data</a></pre>
+<pre>private byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1587">data</a></pre>
</li>
</ul>
</li>
@@ -243,7 +243,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockListLast">
<li class="blockList">
<h4>ZKUtil.ZKUtilOp.SetData</h4>
-<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1712">ZKUtil.ZKUtilOp.SetData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
+<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1589">ZKUtil.ZKUtilOp.SetData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path,
byte[] data)</pre>
</li>
</ul>
@@ -261,7 +261,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockList">
<li class="blockList">
<h4>getData</h4>
-<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1717">getData</a>()</pre>
+<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1594">getData</a>()</pre>
</li>
</ul>
<a name="equals(java.lang.Object)">
@@ -270,7 +270,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1722">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1599">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<dl>
<dt><strong>Overrides:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="class or interface in java.lang">equals</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -283,7 +283,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilO
<ul class="blockListLast">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1731">hashCode</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/ZKUtil.ZKUtilOp.SetData.html#line.1608">hashCode</a>()</pre>
<dl>
<dt><strong>Overrides:</strong></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="class or interface in java.lang">hashCode</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>