You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/06/15 23:19:19 UTC
[44/51] [abbrv] [partial] hbase git commit: Published site at
158568e7806e461275406bc15856ba26e4660f4c
http://git-wip-us.apache.org/repos/asf/hbase/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/ChoreService.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/ChoreService.html b/apidocs/org/apache/hadoop/hbase/ChoreService.html
new file mode 100644
index 0000000..feb1c5e
--- /dev/null
+++ b/apidocs/org/apache/hadoop/hbase/ChoreService.html
@@ -0,0 +1,367 @@
+<!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>ChoreService (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="ChoreService (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/ChoreService.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/CellUtil.html" title="class in org.apache.hadoop.hbase"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/ClockOutOfSyncException.html" title="class in org.apache.hadoop.hbase"><span class="strong">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/hadoop/hbase/ChoreService.html" target="_top">Frames</a></li>
+<li><a href="ChoreService.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>Field | </li>
+<li><a href="#constructor_summary">Constr</a> | </li>
+<li><a href="#method_summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor_detail">Constr</a> | </li>
+<li><a href="#method_detail">Method</a></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</div>
+<h2 title="Class ChoreService" class="title">Class ChoreService</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.ChoreService</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>@InterfaceAudience.Public
+@InterfaceStability.Stable
+public class <a href="../../../../src-html/org/apache/hadoop/hbase/ChoreService.html#line.58">ChoreService</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">ChoreService is a service that can be used to schedule instances of <a href="../../../../org/apache/hadoop/hbase/ScheduledChore.html" title="class in org.apache.hadoop.hbase"><code>ScheduledChore</code></a> to run
+ periodically while sharing threads. The ChoreService is backed by a
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ScheduledThreadPoolExecutor.html?is-external=true" title="class or interface in java.util.concurrent"><code>ScheduledThreadPoolExecutor</code></a> whose core pool size changes dynamically depending on the
+ number of <a href="../../../../org/apache/hadoop/hbase/ScheduledChore.html" title="class in org.apache.hadoop.hbase"><code>ScheduledChore</code></a> scheduled. All of the threads in the core thread pool of the
+ underlying <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ScheduledThreadPoolExecutor.html?is-external=true" title="class or interface in java.util.concurrent"><code>ScheduledThreadPoolExecutor</code></a> are set to be daemon threads.
+ <p>
+ The ChoreService provides the ability to schedule, cancel, and trigger instances of
+ <a href="../../../../org/apache/hadoop/hbase/ScheduledChore.html" title="class in org.apache.hadoop.hbase"><code>ScheduledChore</code></a>. The ChoreService also provides the ability to check on the status of
+ scheduled chores. The number of threads used by the ChoreService changes based on the scheduling
+ load and whether or not the scheduled chores are executing on time. As more chores are scheduled,
+ there may be a need to increase the number of threads if it is noticed that chores are no longer
+ meeting their scheduled start times. On the other hand, as chores are cancelled, an attempt is
+ made to reduce the number of running threads to see if chores can still meet their start times
+ with a smaller thread pool.
+ <p>
+ When finished with a ChoreService it is good practice to call <a href="../../../../org/apache/hadoop/hbase/ChoreService.html#shutdown()"><code>shutdown()</code></a>.
+ Calling this method ensures that all scheduled chores are cancelled and cleaned up properly.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== 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/ChoreService.html#ChoreService(java.lang.String)">ChoreService</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> coreThreadPoolPrefix)</code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><strong><a href="../../../../org/apache/hadoop/hbase/ChoreService.html#ChoreService(java.lang.String,%20boolean)">ChoreService</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> coreThreadPoolPrefix,
+ boolean jitter)</code> </td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a href="../../../../org/apache/hadoop/hbase/ChoreService.html#ChoreService(java.lang.String,%20int,%20boolean)">ChoreService</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> coreThreadPoolPrefix,
+ int corePoolSize,
+ boolean jitter)</code> </td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/ChoreService.html#isShutdown()">isShutdown</a></strong>()</code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/ChoreService.html#isTerminated()">isTerminated</a></strong>()</code> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/ChoreService.html#scheduleChore(org.apache.hadoop.hbase.ScheduledChore)">scheduleChore</a></strong>(<a href="../../../../org/apache/hadoop/hbase/ScheduledChore.html" title="class in org.apache.hadoop.hbase">ScheduledChore</a> chore)</code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/ChoreService.html#shutdown()">shutdown</a></strong>()</code>
+<div class="block">shutdown the service.</div>
+</td>
+</tr>
+</table>
+<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">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ChoreService(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ChoreService</h4>
+<pre>@InterfaceAudience.Private
+public <a href="../../../../src-html/org/apache/hadoop/hbase/ChoreService.html#line.100">ChoreService</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> coreThreadPoolPrefix)</pre>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>coreThreadPoolPrefix</code> - Prefix that will be applied to the Thread name of all threads
+ spawned by this service</dd></dl>
+</li>
+</ul>
+<a name="ChoreService(java.lang.String, boolean)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ChoreService</h4>
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/ChoreService.html#line.110">ChoreService</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> coreThreadPoolPrefix,
+ boolean jitter)</pre>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>coreThreadPoolPrefix</code> - Prefix that will be applied to the Thread name of all threads
+ spawned by this service</dd><dd><code>jitter</code> - Should chore service add some jitter for all of the scheduled chores. When set
+ to true this will add -10% to 10% jitter.</dd></dl>
+</li>
+</ul>
+<a name="ChoreService(java.lang.String, int, boolean)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ChoreService</h4>
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/ChoreService.html#line.123">ChoreService</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> coreThreadPoolPrefix,
+ int corePoolSize,
+ boolean jitter)</pre>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>coreThreadPoolPrefix</code> - Prefix that will be applied to the Thread name of all threads
+ spawned by this service</dd><dd><code>corePoolSize</code> - The initial size to set the core pool of the ScheduledThreadPoolExecutor
+ to during initialization. The default size is 1, but specifying a larger size may be
+ beneficial if you know that 1 thread will not be enough.</dd><dd><code>jitter</code> - Should chore service add some jitter for all of the scheduled chores. When set
+ to true this will add -10% to 10% jitter.</dd></dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="scheduleChore(org.apache.hadoop.hbase.ScheduledChore)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scheduleChore</h4>
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/ChoreService.html#line.148">scheduleChore</a>(<a href="../../../../org/apache/hadoop/hbase/ScheduledChore.html" title="class in org.apache.hadoop.hbase">ScheduledChore</a> chore)</pre>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>chore</code> - Chore to be scheduled. If the chore is already scheduled with another ChoreService
+ instance, that schedule will be cancelled (i.e. a Chore can only ever be scheduled
+ with a single ChoreService instance).</dd>
+<dt><span class="strong">Returns:</span></dt><dd>true when the chore was successfully scheduled. false when the scheduling failed
+ (typically occurs when a chore is scheduled during shutdown of service)</dd></dl>
+</li>
+</ul>
+<a name="shutdown()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>shutdown</h4>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/ChoreService.html#line.325">shutdown</a>()</pre>
+<div class="block">shutdown the service. Any chores that are scheduled for execution will be cancelled. Any chores
+ in the middle of execution will be interrupted and shutdown. This service will be unusable
+ after this method has been called (i.e. future scheduling attempts will fail).</div>
+</li>
+</ul>
+<a name="isShutdown()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isShutdown</h4>
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/ChoreService.html#line.339">isShutdown</a>()</pre>
+<dl><dt><span class="strong">Returns:</span></dt><dd>true when the service is shutdown and thus cannot be used anymore</dd></dl>
+</li>
+</ul>
+<a name="isTerminated()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isTerminated</h4>
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/ChoreService.html#line.346">isTerminated</a>()</pre>
+<dl><dt><span class="strong">Returns:</span></dt><dd>true when the service is shutdown and all threads have terminated</dd></dl>
+</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/ChoreService.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/CellUtil.html" title="class in org.apache.hadoop.hbase"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/ClockOutOfSyncException.html" title="class in org.apache.hadoop.hbase"><span class="strong">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/hadoop/hbase/ChoreService.html" target="_top">Frames</a></li>
+<li><a href="ChoreService.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>Field | </li>
+<li><a href="#constructor_summary">Constr</a> | </li>
+<li><a href="#method_summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor_detail">Constr</a> | </li>
+<li><a href="#method_detail">Method</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2007–2016 <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/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/ClockOutOfSyncException.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/ClockOutOfSyncException.html b/apidocs/org/apache/hadoop/hbase/ClockOutOfSyncException.html
index ff9f3c1..ea85522 100644
--- a/apidocs/org/apache/hadoop/hbase/ClockOutOfSyncException.html
+++ b/apidocs/org/apache/hadoop/hbase/ClockOutOfSyncException.html
@@ -35,7 +35,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/hadoop/hbase/CellUtil.html" title="class in org.apache.hadoop.hbase"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/ChoreService.html" title="class in org.apache.hadoop.hbase"><span class="strong">Prev Class</span></a></li>
<li><a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html" title="class in org.apache.hadoop.hbase"><span class="strong">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -213,7 +213,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/hadoop/hbase/CellUtil.html" title="class in org.apache.hadoop.hbase"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/ChoreService.html" title="class in org.apache.hadoop.hbase"><span class="strong">Prev Class</span></a></li>
<li><a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html" title="class in org.apache.hadoop.hbase"><span class="strong">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -254,6 +254,6 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2007–2016 <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/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/ClusterStatus.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/ClusterStatus.html b/apidocs/org/apache/hadoop/hbase/ClusterStatus.html
index c481d5b..995672c 100644
--- a/apidocs/org/apache/hadoop/hbase/ClusterStatus.html
+++ b/apidocs/org/apache/hadoop/hbase/ClusterStatus.html
@@ -106,7 +106,7 @@
<br>
<pre>@InterfaceAudience.Public
@InterfaceStability.Evolving
-public class <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.65">ClusterStatus</a>
+public class <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.66">ClusterStatus</a>
extends org.apache.hadoop.io.VersionedWritable</pre>
<div class="block">Status information on the HBase cluster.
<p>
@@ -142,13 +142,13 @@ extends org.apache.hadoop.io.VersionedWritable</pre>
<th class="colOne" scope="col">Constructor and Description</th>
</tr>
<tr class="altColor">
-<td class="colOne"><code><strong><a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html#ClusterStatus(java.lang.String,%20java.lang.String,%20java.util.Map,%20java.util.Collection,%20org.apache.hadoop.hbase.ServerName,%20java.util.Collection,%20java.util.Map,%20java.lang.String[],%20java.lang.Boolean)">ClusterStatus</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> hbaseVersion,
+<td class="colOne"><code><strong><a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html#ClusterStatus(java.lang.String,%20java.lang.String,%20java.util.Map,%20java.util.Collection,%20org.apache.hadoop.hbase.ServerName,%20java.util.Collection,%20java.util.Set,%20java.lang.String[],%20java.lang.Boolean)">ClusterStatus</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> hbaseVersion,
<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> clusterid,
<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="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>,<a href="../../../../org/apache/hadoop/hbase/ServerLoad.html" title="class in org.apache.hadoop.hbase">ServerLoad</a>> servers,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> deadServers,
<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> master,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> backupMasters,
- <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>,org.apache.hadoop.hbase.master.RegionState> rit,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><org.apache.hadoop.hbase.master.RegionState> rit,
<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>[] masterCoprocessors,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> balancerOn)</code> </td>
</tr>
@@ -168,18 +168,6 @@ extends org.apache.hadoop.io.VersionedWritable</pre>
<th class="colLast" scope="col">Method and Description</th>
</tr>
<tr class="altColor">
-<td class="colFirst"><code>org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus</code></td>
-<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html#convert()">convert</a></strong>()</code>
-<div class="block">Convert a ClusterStatus to a protobuf ClusterStatus</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html" title="class in org.apache.hadoop.hbase">ClusterStatus</a></code></td>
-<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html#convert(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus)">convert</a></strong>(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus proto)</code>
-<div class="block">Convert a protobuf ClusterStatus to a ClusterStatus</div>
-</td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html#equals(java.lang.Object)">equals</a></strong>(<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)</code> </td>
</tr>
@@ -308,19 +296,19 @@ extends org.apache.hadoop.io.VersionedWritable</pre>
<!-- -->
</a>
<h3>Constructor Detail</h3>
-<a name="ClusterStatus(java.lang.String, java.lang.String, java.util.Map, java.util.Collection, org.apache.hadoop.hbase.ServerName, java.util.Collection, java.util.Map, java.lang.String[], java.lang.Boolean)">
+<a name="ClusterStatus(java.lang.String, java.lang.String, java.util.Map, java.util.Collection, org.apache.hadoop.hbase.ServerName, java.util.Collection, java.util.Set, java.lang.String[], java.lang.Boolean)">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>ClusterStatus</h4>
-<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.88">ClusterStatus</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> hbaseVersion,
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.89">ClusterStatus</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> hbaseVersion,
<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> clusterid,
<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="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>,<a href="../../../../org/apache/hadoop/hbase/ServerLoad.html" title="class in org.apache.hadoop.hbase">ServerLoad</a>> servers,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> deadServers,
<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> master,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> backupMasters,
- <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>,org.apache.hadoop.hbase.master.RegionState> rit,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><org.apache.hadoop.hbase.master.RegionState> rit,
<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>[] masterCoprocessors,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> balancerOn)</pre>
</li>
@@ -339,7 +327,7 @@ extends org.apache.hadoop.io.VersionedWritable</pre>
<ul class="blockList">
<li class="blockList">
<h4>getDeadServerNames</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.111">getDeadServerNames</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.112">getDeadServerNames</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the names of region servers on the dead list</dd></dl>
</li>
</ul>
@@ -349,7 +337,7 @@ extends org.apache.hadoop.io.VersionedWritable</pre>
<ul class="blockList">
<li class="blockList">
<h4>getServersSize</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.121">getServersSize</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.122">getServersSize</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the number of region servers in the cluster</dd></dl>
</li>
</ul>
@@ -360,7 +348,7 @@ extends org.apache.hadoop.io.VersionedWritable</pre>
<li class="blockList">
<h4>getDeadServers</h4>
<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 int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.132">getDeadServers</a>()</pre>
+public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.133">getDeadServers</a>()</pre>
<div class="block"><span class="strong">Deprecated.</span> <i>As of release 2.0.0, this will be removed in HBase 3.0.0
(<a href="https://issues.apache.org/jira/browse/HBASE-13656">HBASE-13656</a>).
Use <a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html#getDeadServersSize()"><code>getDeadServersSize()</code></a>.</i></div>
@@ -373,7 +361,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getDeadServersSize</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.139">getDeadServersSize</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.140">getDeadServersSize</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the number of dead region servers in the cluster</dd></dl>
</li>
</ul>
@@ -383,7 +371,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getAverageLoad</h4>
-<pre>public double <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.147">getAverageLoad</a>()</pre>
+<pre>public double <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.148">getAverageLoad</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the average cluster load</dd></dl>
</li>
</ul>
@@ -393,7 +381,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getRegionsCount</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.155">getRegionsCount</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.156">getRegionsCount</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the number of regions deployed on the cluster</dd></dl>
</li>
</ul>
@@ -403,7 +391,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getRequestsCount</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.168">getRequestsCount</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.169">getRequestsCount</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the number of requests since last report</dd></dl>
</li>
</ul>
@@ -413,7 +401,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getHBaseVersion</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/ClusterStatus.html#line.181">getHBaseVersion</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/ClusterStatus.html#line.182">getHBaseVersion</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the HBase version string as reported by the HMaster</dd></dl>
</li>
</ul>
@@ -423,7 +411,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.188">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/ClusterStatus.html#line.189">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>
@@ -436,7 +424,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.208">hashCode</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.209">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>
@@ -449,7 +437,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getVersion</h4>
-<pre>public byte <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.215">getVersion</a>()</pre>
+<pre>public byte <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.216">getVersion</a>()</pre>
<dl>
<dt><strong>Specified by:</strong></dt>
<dd><code>getVersion</code> in class <code>org.apache.hadoop.io.VersionedWritable</code></dd>
@@ -462,7 +450,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getServers</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.223">getServers</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.224">getServers</a>()</pre>
</li>
</ul>
<a name="getMaster()">
@@ -471,7 +459,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getMaster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.234">getMaster</a>()</pre>
+<pre>public <a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.235">getMaster</a>()</pre>
<div class="block">Returns detailed information about the current master <a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase"><code>ServerName</code></a>.</div>
<dl><dt><span class="strong">Returns:</span></dt><dd>current master information if it exists</dd></dl>
</li>
@@ -482,7 +470,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getBackupMastersSize</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.241">getBackupMastersSize</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.242">getBackupMastersSize</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the number of backup masters in the cluster</dd></dl>
</li>
</ul>
@@ -492,7 +480,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getBackupMasters</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.248">getBackupMasters</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.249">getBackupMasters</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>the names of backup masters</dd></dl>
</li>
</ul>
@@ -502,7 +490,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getLoad</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/ServerLoad.html" title="class in org.apache.hadoop.hbase">ServerLoad</a> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.259">getLoad</a>(<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> sn)</pre>
+<pre>public <a href="../../../../org/apache/hadoop/hbase/ServerLoad.html" title="class in org.apache.hadoop.hbase">ServerLoad</a> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.260">getLoad</a>(<a href="../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> sn)</pre>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>sn</code> - </dd>
<dt><span class="strong">Returns:</span></dt><dd>Server's load or null if not found.</dd></dl>
</li>
@@ -513,7 +501,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getClusterId</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/ClusterStatus.html#line.268">getClusterId</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/ClusterStatus.html#line.269">getClusterId</a>()</pre>
</li>
</ul>
<a name="getMasterCoprocessors()">
@@ -522,7 +510,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getMasterCoprocessors</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/ClusterStatus.html#line.272">getMasterCoprocessors</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/ClusterStatus.html#line.273">getMasterCoprocessors</a>()</pre>
</li>
</ul>
<a name="getLastMajorCompactionTsForTable(org.apache.hadoop.hbase.TableName)">
@@ -531,7 +519,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getLastMajorCompactionTsForTable</h4>
-<pre>public long <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.276">getLastMajorCompactionTsForTable</a>(<a href="../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> table)</pre>
+<pre>public long <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.277">getLastMajorCompactionTsForTable</a>(<a href="../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> table)</pre>
</li>
</ul>
<a name="getLastMajorCompactionTsForRegion(byte[])">
@@ -540,7 +528,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getLastMajorCompactionTsForRegion</h4>
-<pre>public long <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.289">getLastMajorCompactionTsForRegion</a>(byte[] region)</pre>
+<pre>public long <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.290">getLastMajorCompactionTsForRegion</a>(byte[] region)</pre>
</li>
</ul>
<a name="isBalancerOn()">
@@ -549,7 +537,7 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>isBalancerOn</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.300">isBalancerOn</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.301">isBalancerOn</a>()</pre>
</li>
</ul>
<a name="getBalancerOn()">
@@ -558,45 +546,22 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<ul class="blockList">
<li class="blockList">
<h4>getBalancerOn</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.304">getBalancerOn</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.305">getBalancerOn</a>()</pre>
</li>
</ul>
<a name="toString()">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<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/ClusterStatus.html#line.308">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/ClusterStatus.html#line.309">toString</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#toString()" title="class or interface in java.lang">toString</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>
</dl>
</li>
</ul>
-<a name="convert()">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>convert</h4>
-<pre>public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.355">convert</a>()</pre>
-<div class="block">Convert a ClusterStatus to a protobuf ClusterStatus</div>
-<dl><dt><span class="strong">Returns:</span></dt><dd>the protobuf ClusterStatus</dd></dl>
-</li>
-</ul>
-<a name="convert(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus)">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>convert</h4>
-<pre>public static <a href="../../../../org/apache/hadoop/hbase/ClusterStatus.html" title="class in org.apache.hadoop.hbase">ClusterStatus</a> <a href="../../../../src-html/org/apache/hadoop/hbase/ClusterStatus.html#line.421">convert</a>(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus proto)</pre>
-<div class="block">Convert a protobuf ClusterStatus to a ClusterStatus</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>proto</code> - the protobuf ClusterStatus</dd>
-<dt><span class="strong">Returns:</span></dt><dd>the converted ClusterStatus</dd></dl>
-</li>
-</ul>
</li>
</ul>
</li>
@@ -664,6 +629,6 @@ public int <a href="../../../../src-html/org/apache/hadoop/hbase/Clust
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2007–2016 <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/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/DoNotRetryIOException.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/DoNotRetryIOException.html b/apidocs/org/apache/hadoop/hbase/DoNotRetryIOException.html
index 0df38d0..e1c7b89 100644
--- a/apidocs/org/apache/hadoop/hbase/DoNotRetryIOException.html
+++ b/apidocs/org/apache/hadoop/hbase/DoNotRetryIOException.html
@@ -306,6 +306,6 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseIOException.html" titl
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2007–2016 <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/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/DroppedSnapshotException.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/DroppedSnapshotException.html b/apidocs/org/apache/hadoop/hbase/DroppedSnapshotException.html
index 4520700..6c55f32 100644
--- a/apidocs/org/apache/hadoop/hbase/DroppedSnapshotException.html
+++ b/apidocs/org/apache/hadoop/hbase/DroppedSnapshotException.html
@@ -270,6 +270,6 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2007–2016 <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/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html b/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
index 39c476c..a90e97e 100644
--- a/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
+++ b/apidocs/org/apache/hadoop/hbase/HBaseConfiguration.html
@@ -106,7 +106,7 @@
<br>
<pre>@InterfaceAudience.Public
@InterfaceStability.Stable
-public class <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.38">HBaseConfiguration</a>
+public class <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.39">HBaseConfiguration</a>
extends org.apache.hadoop.conf.Configuration</pre>
<div class="block">Adds HBase configuration files to a Configuration</div>
</li>
@@ -170,6 +170,23 @@ extends org.apache.hadoop.conf.Configuration</pre>
<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#create(org.apache.hadoop.conf.Configuration)">create</a></strong>(org.apache.hadoop.conf.Configuration that)</code> </td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>static org.apache.hadoop.conf.Configuration</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String)">createClusterConf</a></strong>(org.apache.hadoop.conf.Configuration baseConf,
+ <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> clusterKey)</code>
+<div class="block">Generates a <code>Configuration</code> instance by applying the ZooKeeper cluster key
+ to the base Configuration.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static org.apache.hadoop.conf.Configuration</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String)">createClusterConf</a></strong>(org.apache.hadoop.conf.Configuration baseConf,
+ <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> clusterKey,
+ <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> overridePrefix)</code>
+<div class="block">Generates a <code>Configuration</code> instance by applying property overrides prefixed by
+ a cluster profile key to the base Configuration.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>static int</code></td>
<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#getInt(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String,%20int)">getInt</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,
@@ -206,6 +223,15 @@ extends org.apache.hadoop.conf.Configuration</pre>
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#setWithPrefix(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.Iterable)">setWithPrefix</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> prefix,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</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>>> properties)</code>
+<div class="block">Sets all the entries in the provided <code>Map<String, String></code> as properties in the
+ given <code>Configuration</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>static org.apache.hadoop.conf.Configuration</code></td>
<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#subset(org.apache.hadoop.conf.Configuration,%20java.lang.String)">subset</a></strong>(org.apache.hadoop.conf.Configuration srcConf,
<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> prefix)</code>
@@ -248,7 +274,7 @@ extends org.apache.hadoop.conf.Configuration</pre>
<li class="blockList">
<h4>HBaseConfiguration</h4>
<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 <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.47">HBaseConfiguration</a>()</pre>
+public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.48">HBaseConfiguration</a>()</pre>
<div class="block"><span class="strong">Deprecated.</span> <i>Please use create() instead.</i></div>
<div class="block">Instantiating HBaseConfiguration() is deprecated. Please use
HBaseConfiguration#create() to construct a plain Configuration</div>
@@ -261,7 +287,7 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<li class="blockList">
<h4>HBaseConfiguration</h4>
<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 <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.61">HBaseConfiguration</a>(org.apache.hadoop.conf.Configuration c)</pre>
+public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.62">HBaseConfiguration</a>(org.apache.hadoop.conf.Configuration c)</pre>
<div class="block"><span class="strong">Deprecated.</span> <i>Please user create(conf) instead.</i></div>
<div class="block">Instantiating HBaseConfiguration() is deprecated. Please use
HBaseConfiguration#create(conf) to construct a plain Configuration</div>
@@ -281,7 +307,7 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>addHbaseResources</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.78">addHbaseResources</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.79">addHbaseResources</a>(org.apache.hadoop.conf.Configuration conf)</pre>
</li>
</ul>
<a name="create()">
@@ -290,7 +316,7 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>create</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.91">create</a>()</pre>
+<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.92">create</a>()</pre>
<div class="block">Creates a Configuration with HBase resources</div>
<dl><dt><span class="strong">Returns:</span></dt><dd>a Configuration with HBase resources</dd></dl>
</li>
@@ -301,7 +327,7 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>create</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.105">create</a>(org.apache.hadoop.conf.Configuration that)</pre>
+<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.106">create</a>(org.apache.hadoop.conf.Configuration that)</pre>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>that</code> - Configuration to clone.</dd>
<dt><span class="strong">Returns:</span></dt><dd>a Configuration created with the hbase-*.xml files plus
the given configuration.</dd></dl>
@@ -313,7 +339,7 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>merge</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.117">merge</a>(org.apache.hadoop.conf.Configuration destConf,
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.118">merge</a>(org.apache.hadoop.conf.Configuration destConf,
org.apache.hadoop.conf.Configuration srcConf)</pre>
<div class="block">Merge two configurations.</div>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>destConf</code> - the configuration that will be overwritten with items
@@ -326,7 +352,7 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>subset</h4>
-<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.130">subset</a>(org.apache.hadoop.conf.Configuration srcConf,
+<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.131">subset</a>(org.apache.hadoop.conf.Configuration srcConf,
<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> prefix)</pre>
<div class="block">Returns a subset of the configuration properties, matching the given key prefix.
The prefix is stripped from the return keys, ie. when calling with a prefix of "myprefix",
@@ -335,13 +361,27 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
included in the results, since it would show up as an entry with an empty key.</div>
</li>
</ul>
+<a name="setWithPrefix(org.apache.hadoop.conf.Configuration, java.lang.String, java.lang.Iterable)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setWithPrefix</h4>
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.150">setWithPrefix</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> prefix,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</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>>> properties)</pre>
+<div class="block">Sets all the entries in the provided <code>Map<String, String></code> as properties in the
+ given <code>Configuration</code>. Each property will have the specified prefix prepended,
+ so that the configuration entries are keyed by <code>prefix + entry.getKey()</code>.</div>
+</li>
+</ul>
<a name="isShowConfInServlet()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>isShowConfInServlet</h4>
-<pre>public static boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.147">isShowConfInServlet</a>()</pre>
+<pre>public static boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.160">isShowConfInServlet</a>()</pre>
<dl><dt><span class="strong">Returns:</span></dt><dd>whether to show HBase Configuration in servlet</dd></dl>
</li>
</ul>
@@ -351,7 +391,7 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>getInt</h4>
-<pre>public static int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.181">getInt</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public static int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.194">getInt</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,
<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> deprecatedName,
int defaultValue)</pre>
@@ -374,7 +414,7 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<ul class="blockList">
<li class="blockList">
<h4>getPassword</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/HBaseConfiguration.html#line.203">getPassword</a>(org.apache.hadoop.conf.Configuration conf,
+<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/HBaseConfiguration.html#line.216">getPassword</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> alias,
<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> defPass)
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>
@@ -387,13 +427,53 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<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="createClusterConf(org.apache.hadoop.conf.Configuration, java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createClusterConf</h4>
+<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.264">createClusterConf</a>(org.apache.hadoop.conf.Configuration baseConf,
+ <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> clusterKey)
+ 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">Generates a <code>Configuration</code> instance by applying the ZooKeeper cluster key
+ to the base Configuration. Note that additional configuration properties may be needed
+ for a remote cluster, so it is preferable to use
+ <a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String)"><code>createClusterConf(Configuration, String, String)</code></a>.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>baseConf</code> - the base configuration to use, containing prefixed override properties</dd><dd><code>clusterKey</code> - the ZooKeeper quorum cluster key to apply, or <code>null</code> if none</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the merged configuration with override properties and cluster key applied</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><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#createClusterConf(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20java.lang.String)"><code>createClusterConf(Configuration, String, String)</code></a></dd></dl>
+</li>
+</ul>
+<a name="createClusterConf(org.apache.hadoop.conf.Configuration, java.lang.String, java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createClusterConf</h4>
+<pre>public static org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.281">createClusterConf</a>(org.apache.hadoop.conf.Configuration baseConf,
+ <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> clusterKey,
+ <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> overridePrefix)
+ 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">Generates a <code>Configuration</code> instance by applying property overrides prefixed by
+ a cluster profile key to the base Configuration. Override properties are extracted by
+ the <a href="../../../../org/apache/hadoop/hbase/HBaseConfiguration.html#subset(org.apache.hadoop.conf.Configuration,%20java.lang.String)"><code>subset(Configuration, String)</code></a> method, then the merged on top of the base
+ Configuration and returned.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>baseConf</code> - the base configuration to use, containing prefixed override properties</dd><dd><code>clusterKey</code> - the ZooKeeper quorum cluster key to apply, or <code>null</code> if none</dd><dd><code>overridePrefix</code> - the property key prefix to match for override properties,
+ or <code>null</code> if none</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the merged configuration with override properties and cluster key applied</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="main(java.lang.String[])">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.243">main</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>[] args)
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfiguration.html#line.315">main</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>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">For debugging. Dump configurations to system output as xml format.
Master and RS configurations can also be dumped using
@@ -469,6 +549,6 @@ public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseConfigura
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2007–2016 <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/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/HBaseIOException.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/HBaseIOException.html b/apidocs/org/apache/hadoop/hbase/HBaseIOException.html
index 284ac23..9cbec4a 100644
--- a/apidocs/org/apache/hadoop/hbase/HBaseIOException.html
+++ b/apidocs/org/apache/hadoop/hbase/HBaseIOException.html
@@ -114,7 +114,7 @@
</dl>
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/hadoop/hbase/DoNotRetryIOException.html" title="class in org.apache.hadoop.hbase">DoNotRetryIOException</a>, <a href="../../../../org/apache/hadoop/hbase/ipc/FailedServerException.html" title="class in org.apache.hadoop.hbase.ipc">FailedServerException</a>, <a href="../../../../org/apache/hadoop/hbase/PleaseHoldException.html" title="class in org.apache.hadoop.hbase">PleaseHoldException</a>, <a href="../../../../org/apache/hadoop/hbase/RegionException.html" title="class in org.apache.hadoop.hbase">RegionException</a>, <a href="../../../../org/apache/hadoop/hbase/ipc/StoppedRpcClientException.html" title="class in org.apache.hadoop.hbase.ipc">StoppedRpcClientException</a>, <a href="../../../../org/apache/hadoop/hbase/TableInfoMissingException.html" title="class in org.apache.hadoop.hbase">TableInfoMissingException</a>, <a href="../../../../org/apache/hadoop/hbase/client/WrongRowIOException.html" title="class in org.apache.hadoop.hbase.client">Wrong
RowIOException</a></dd>
+<dd><a href="../../../../org/apache/hadoop/hbase/DoNotRetryIOException.html" title="class in org.apache.hadoop.hbase">DoNotRetryIOException</a>, <a href="../../../../org/apache/hadoop/hbase/ipc/FailedServerException.html" title="class in org.apache.hadoop.hbase.ipc">FailedServerException</a>, <a href="../../../../org/apache/hadoop/hbase/util/LeaseNotRecoveredException.html" title="class in org.apache.hadoop.hbase.util">LeaseNotRecoveredException</a>, <a href="../../../../org/apache/hadoop/hbase/PleaseHoldException.html" title="class in org.apache.hadoop.hbase">PleaseHoldException</a>, <a href="../../../../org/apache/hadoop/hbase/RegionException.html" title="class in org.apache.hadoop.hbase">RegionException</a>, <a href="../../../../org/apache/hadoop/hbase/ipc/StoppedRpcClientException.html" title="class in org.apache.hadoop.hbase.ipc">StoppedRpcClientException</a>, <a href="../../../../org/apache/hadoop/hbase/TableInfoMissingException.html" title="class in org.apache.hadoop.hbase">T
ableInfoMissingException</a>, <a href="../../../../org/apache/hadoop/hbase/client/WrongRowIOException.html" title="class in org.apache.hadoop.hbase.client">WrongRowIOException</a></dd>
</dl>
<hr>
<br>
@@ -295,6 +295,6 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.ht
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2007–2016 <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/blob/702fbc6f/apidocs/org/apache/hadoop/hbase/HBaseInterfaceAudience.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/HBaseInterfaceAudience.html b/apidocs/org/apache/hadoop/hbase/HBaseInterfaceAudience.html
index d64e92d..9be5fa7 100644
--- a/apidocs/org/apache/hadoop/hbase/HBaseInterfaceAudience.html
+++ b/apidocs/org/apache/hadoop/hbase/HBaseInterfaceAudience.html
@@ -292,6 +292,6 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2007–2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
</body>
</html>