hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [18/18] hbase-site git commit: Published site at d6b3d838eba382f6b7734ca1f40fa58eb97a4f89.
Date Tue, 26 Jan 2016 17:56:13 GMT
Published site at d6b3d838eba382f6b7734ca1f40fa58eb97a4f89.


Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/c221e35e
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/c221e35e
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/c221e35e

Branch: refs/heads/asf-site
Commit: c221e35e79ca02ce987879d94446d4d20cc1428d
Parents: f8d6f42
Author: jenkins <builds@apache.org>
Authored: Tue Jan 26 15:22:39 2016 +0000
Committer: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Committed: Tue Jan 26 09:54:44 2016 -0800

----------------------------------------------------------------------
 acid-semantics.html                             |     4 +-
 apache_hbase_reference_guide.pdf                |   Bin 14205622 -> 14205622 bytes
 apache_hbase_reference_guide.pdfmarks           |     4 +-
 apidocs/index-all.html                          |    12 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |    65 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |   386 +-
 book.html                                       |     2 +-
 bulk-loads.html                                 |     4 +-
 checkstyle-aggregate.html                       | 27012 ++++++++---------
 checkstyle.rss                                  |     4 +-
 coc.html                                        |     4 +-
 cygwin.html                                     |     4 +-
 dependencies.html                               |     4 +-
 dependency-convergence.html                     |     4 +-
 dependency-info.html                            |     4 +-
 dependency-management.html                      |     4 +-
 devapidocs/index-all.html                       |    12 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |    65 +-
 .../hbase/classification/package-tree.html      |     8 +-
 .../hadoop/hbase/client/package-tree.html       |     6 +-
 .../hadoop/hbase/filter/package-tree.html       |     8 +-
 .../hadoop/hbase/io/hfile/package-tree.html     |     6 +-
 .../hadoop/hbase/mapreduce/package-tree.html    |     2 +-
 .../hadoop/hbase/master/package-tree.html       |     6 +-
 .../hbase/master/procedure/package-tree.html    |     2 +-
 .../org/apache/hadoop/hbase/package-tree.html   |     8 +-
 .../hadoop/hbase/quotas/package-tree.html       |     6 +-
 .../hadoop/hbase/regionserver/package-tree.html |    24 +-
 .../hadoop/hbase/thrift/package-tree.html       |     2 +-
 .../tmpl/master/MasterStatusTmpl.ImplData.html  |   240 +-
 .../hbase/tmpl/master/MasterStatusTmpl.html     |    96 +-
 .../hbase/tmpl/master/MasterStatusTmplImpl.html |    48 +-
 .../regionserver/RSStatusTmpl.ImplData.html     |    90 +-
 .../hbase/tmpl/regionserver/RSStatusTmpl.html   |    36 +-
 .../tmpl/regionserver/RSStatusTmplImpl.html     |    18 +-
 .../class-use/JVMClusterUtil.MasterThread.html  |     3 +-
 .../JVMClusterUtil.RegionServerThread.html      |     3 +-
 .../apache/hadoop/hbase/util/package-tree.html  |     8 +-
 .../apache/hadoop/hbase/wal/package-tree.html   |     2 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |   386 +-
 .../tmpl/master/MasterStatusTmpl.ImplData.html  |   240 +-
 .../tmpl/master/MasterStatusTmpl.Intf.html      |   240 +-
 .../hbase/tmpl/master/MasterStatusTmpl.html     |   240 +-
 .../hbase/tmpl/master/MasterStatusTmplImpl.html |    64 +-
 .../regionserver/RSStatusTmpl.ImplData.html     |    90 +-
 .../tmpl/regionserver/RSStatusTmpl.Intf.html    |    90 +-
 .../hbase/tmpl/regionserver/RSStatusTmpl.html   |    90 +-
 .../tmpl/regionserver/RSStatusTmplImpl.html     |    24 +-
 distribution-management.html                    |     4 +-
 export_control.html                             |     4 +-
 hbase-annotations/checkstyle.html               |     6 +-
 hbase-annotations/dependencies.html             |     6 +-
 hbase-annotations/dependency-convergence.html   |     6 +-
 hbase-annotations/dependency-info.html          |     6 +-
 hbase-annotations/dependency-management.html    |     6 +-
 hbase-annotations/distribution-management.html  |     6 +-
 hbase-annotations/index.html                    |     6 +-
 hbase-annotations/integration.html              |     6 +-
 hbase-annotations/issue-tracking.html           |     6 +-
 hbase-annotations/license.html                  |     6 +-
 hbase-annotations/mail-lists.html               |     6 +-
 hbase-annotations/plugin-management.html        |     6 +-
 hbase-annotations/plugins.html                  |     6 +-
 hbase-annotations/project-info.html             |     6 +-
 hbase-annotations/project-reports.html          |     6 +-
 hbase-annotations/project-summary.html          |     6 +-
 hbase-annotations/source-repository.html        |     6 +-
 hbase-annotations/team-list.html                |     6 +-
 hbase-spark/checkstyle.html                     |     6 +-
 hbase-spark/dependencies.html                   |     6 +-
 hbase-spark/dependency-convergence.html         |     6 +-
 hbase-spark/dependency-info.html                |     6 +-
 hbase-spark/dependency-management.html          |     6 +-
 hbase-spark/distribution-management.html        |     6 +-
 hbase-spark/index.html                          |     6 +-
 hbase-spark/integration.html                    |     6 +-
 hbase-spark/issue-tracking.html                 |     6 +-
 hbase-spark/license.html                        |     6 +-
 hbase-spark/mail-lists.html                     |     6 +-
 hbase-spark/plugin-management.html              |     6 +-
 hbase-spark/plugins.html                        |     6 +-
 hbase-spark/project-info.html                   |     6 +-
 hbase-spark/project-reports.html                |     6 +-
 hbase-spark/project-summary.html                |     6 +-
 hbase-spark/source-repository.html              |     6 +-
 hbase-spark/team-list.html                      |     6 +-
 index.html                                      |     4 +-
 integration.html                                |     4 +-
 issue-tracking.html                             |     4 +-
 license.html                                    |     4 +-
 mail-lists.html                                 |     4 +-
 metrics.html                                    |     4 +-
 modules.html                                    |     4 +-
 old_news.html                                   |     4 +-
 plugin-management.html                          |     4 +-
 plugins.html                                    |     4 +-
 poweredbyhbase.html                             |     4 +-
 project-info.html                               |     4 +-
 project-reports.html                            |     4 +-
 project-summary.html                            |     4 +-
 pseudo-distributed.html                         |     4 +-
 replication.html                                |     4 +-
 resources.html                                  |     4 +-
 source-repository.html                          |     4 +-
 sponsors.html                                   |     4 +-
 supportingprojects.html                         |     4 +-
 team-list.html                                  |     4 +-
 .../apache/hadoop/hbase/MiniHBaseCluster.html   |   122 +-
 .../apache/hadoop/hbase/MiniHBaseCluster.html   |  1453 +-
 testdevapidocs/index-all.html                   |     2 -
 ...aseCluster.MiniHBaseClusterRegionServer.html |    35 +-
 ...eCluster.SingleFileSystemShutdownThread.html |     8 +-
 .../apache/hadoop/hbase/MiniHBaseCluster.html   |   124 +-
 .../TestLocalHBaseCluster.MyHRegionServer.html  |    11 +-
 ...ovedRegionsCleaner.TestMockRegionServer.html |    11 +-
 ...rRPCTimeout.RegionServerWithScanTimeout.html |    11 +-
 .../hadoop/hbase/io/hfile/package-tree.html     |     2 +-
 ...signmentManagerOnCluster.MyRegionServer.html |     7 -
 .../TestMetaShutdownHandler.MyRegionServer.html |    11 +-
 .../org/apache/hadoop/hbase/package-tree.html   |     8 +-
 ...lledWhenInitializing.MockedRegionServer.html |    11 +-
 ...egionServerReportForDuty.MyRegionServer.html |     7 -
 .../apache/hadoop/hbase/test/package-tree.html  |     2 +-
 .../apache/hadoop/hbase/wal/package-tree.html   |     2 +-
 ...aseCluster.MiniHBaseClusterRegionServer.html |  1453 +-
 ...eCluster.SingleFileSystemShutdownThread.html |  1453 +-
 .../apache/hadoop/hbase/MiniHBaseCluster.html   |  1453 +-
 .../apache/hadoop/hbase/MiniHBaseCluster.html   |  1453 +-
 .../apache/hadoop/hbase/LocalHBaseCluster.html  |   386 +-
 .../hbase/tmpl/common/TaskMonitorTmpl.html      |    90 +-
 .../hbase/tmpl/common/TaskMonitorTmplImpl.html  |    24 +-
 .../hbase/tmpl/master/MasterStatusTmpl.html     |   240 +-
 .../hbase/tmpl/master/MasterStatusTmplImpl.html |    64 +-
 .../hbase/tmpl/regionserver/RSStatusTmpl.html   |    90 +-
 .../tmpl/regionserver/RSStatusTmplImpl.html     |    24 +-
 135 files changed, 19145 insertions(+), 19400 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c221e35e/acid-semantics.html
----------------------------------------------------------------------
diff --git a/acid-semantics.html b/acid-semantics.html
index e4ec6db..61acee6 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160124" />
+    <meta name="Date-Revision-yyyymmdd" content="20160126" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Apache HBase (TM) ACID Properties
@@ -600,7 +600,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-24</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-26</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c221e35e/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index e43f346..13dd488 100644
Binary files a/apache_hbase_reference_guide.pdf and b/apache_hbase_reference_guide.pdf differ

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c221e35e/apache_hbase_reference_guide.pdfmarks
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdfmarks b/apache_hbase_reference_guide.pdfmarks
index 053fb1f..f279f2d 100644
--- a/apache_hbase_reference_guide.pdfmarks
+++ b/apache_hbase_reference_guide.pdfmarks
@@ -2,8 +2,8 @@
   /Author (Apache HBase Team)
   /Subject ()
   /Keywords ()
-  /ModDate (D:20160124152328)
-  /CreationDate (D:20160124152328)
+  /ModDate (D:20160126151912)
+  /CreationDate (D:20160126151912)
   /Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1)
   /Producer ()
   /DOCINFO pdfmark

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c221e35e/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/apidocs/index-all.html b/apidocs/index-all.html
index e3bd835..eb4c482 100644
--- a/apidocs/index-all.html
+++ b/apidocs/index-all.html
@@ -14349,23 +14349,19 @@ the order they are declared.</div>
 </dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/LocalHBaseCluster.html#waitOnMaster(int)">waitOnMaster(int)</a></span> - Method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/LocalHBaseCluster.html" title="class in org.apache.hadoop.hbase">LocalHBaseCluster</a></dt>
 <dd>
-<div class="block">Wait for the specified master to stop
- Removes this thread from list of running threads.</div>
+<div class="block">Wait for the specified master to stop.</div>
 </dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/LocalHBaseCluster.html#waitOnMaster(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread)">waitOnMaster(JVMClusterUtil.MasterThread)</a></span> - Method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/LocalHBaseCluster.html" title="class in org.apache.hadoop.hbase">LocalHBaseCluster</a></dt>
 <dd>
-<div class="block">Wait for the specified master to stop
- Removes this thread from list of running threads.</div>
+<div class="block">Wait for the specified master to stop.</div>
 </dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/LocalHBaseCluster.html#waitOnRegionServer(int)">waitOnRegionServer(int)</a></span> - Method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/LocalHBaseCluster.html" title="class in org.apache.hadoop.hbase">LocalHBaseCluster</a></dt>
 <dd>
-<div class="block">Wait for the specified region server to stop
- Removes this thread from list of running threads.</div>
+<div class="block">Wait for the specified region server to stop.</div>
 </dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/LocalHBaseCluster.html#waitOnRegionServer(org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread)">waitOnRegionServer(JVMClusterUtil.RegionServerThread)</a></span> - Method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/LocalHBaseCluster.html" title="class in org.apache.hadoop.hbase">LocalHBaseCluster</a></dt>
 <dd>
-<div class="block">Wait for the specified region server to stop
- Removes this thread from list of running threads.</div>
+<div class="block">Wait for the specified region server to stop.</div>
 </dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/Import.html#WAL_DURABILITY">WAL_DURABILITY</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/Import.html" title="class in org.apache.hadoop.hbase.mapreduce">Import</a></dt>
 <dd>&nbsp;</dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c221e35e/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html b/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 934dbc7..b04d37c 100644
--- a/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -293,29 +293,25 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <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/LocalHBaseCluster.html#waitOnMaster(int)">waitOnMaster</a></strong>(int&nbsp;serverNumber)</code>
-<div class="block">Wait for the specified master to stop
- Removes this thread from list of running threads.</div>
+<div class="block">Wait for the specified master to stop.</div>
 </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/LocalHBaseCluster.html#waitOnMaster(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread)">waitOnMaster</a></strong>(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&nbsp;masterThread)</code>
-<div class="block">Wait for the specified master to stop
- Removes this thread from list of running threads.</div>
+<div class="block">Wait for the specified master to stop.</div>
 </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/LocalHBaseCluster.html#waitOnRegionServer(int)">waitOnRegionServer</a></strong>(int&nbsp;serverNumber)</code>
-<div class="block">Wait for the specified region server to stop
- Removes this thread from list of running threads.</div>
+<div class="block">Wait for the specified region server to stop.</div>
 </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/LocalHBaseCluster.html#waitOnRegionServer(org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread)">waitOnRegionServer</a></strong>(org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread&nbsp;rst)</code>
-<div class="block">Wait for the specified region server to stop
- Removes this thread from list of running threads.</div>
+<div class="block">Wait for the specified region server to stop.</div>
 </td>
 </tr>
 </table>
@@ -575,11 +571,9 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>waitOnRegionServer</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.281">waitOnRegionServer</a>(int&nbsp;serverNumber)</pre>
-<div class="block">Wait for the specified region server to stop
- Removes this thread from list of running threads.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>serverNumber</code> - </dd>
-<dt><span class="strong">Returns:</span></dt><dd>Name of region server that just went down.</dd></dl>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.279">waitOnRegionServer</a>(int&nbsp;serverNumber)</pre>
+<div class="block">Wait for the specified region server to stop. Removes this thread from list of running threads.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>Name of region server that just went down.</dd></dl>
 </li>
 </ul>
 <a name="waitOnRegionServer(org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread)">
@@ -588,11 +582,9 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>waitOnRegionServer</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.302">waitOnRegionServer</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread&nbsp;rst)</pre>
-<div class="block">Wait for the specified region server to stop
- Removes this thread from list of running threads.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>rst</code> - </dd>
-<dt><span class="strong">Returns:</span></dt><dd>Name of region server that just went down.</dd></dl>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.288">waitOnRegionServer</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread&nbsp;rst)</pre>
+<div class="block">Wait for the specified region server to stop. Removes this thread from list of running threads.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>Name of region server that just went down.</dd></dl>
 </li>
 </ul>
 <a name="getMaster(int)">
@@ -601,9 +593,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getMaster</h4>
-<pre>public&nbsp;org.apache.hadoop.hbase.master.HMaster&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.325">getMaster</a>(int&nbsp;serverNumber)</pre>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>serverNumber</code> - </dd>
-<dt><span class="strong">Returns:</span></dt><dd>the HMaster thread</dd></dl>
+<pre>public&nbsp;org.apache.hadoop.hbase.master.HMaster&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.304">getMaster</a>(int&nbsp;serverNumber)</pre>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the HMaster thread</dd></dl>
 </li>
 </ul>
 <a name="getActiveMaster()">
@@ -612,7 +603,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getActiveMaster</h4>
-<pre>public&nbsp;org.apache.hadoop.hbase.master.HMaster&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.334">getActiveMaster</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.hbase.master.HMaster&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.313">getActiveMaster</a>()</pre>
 <div class="block">Gets the current active master, if available.  If no active master, returns
  null.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>the HMaster for the active master</dd></dl>
@@ -624,7 +615,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getMasters</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.350">getMasters</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.329">getMasters</a>()</pre>
 <dl><dt><span class="strong">Returns:</span></dt><dd>Read-only list of master threads.</dd></dl>
 </li>
 </ul>
@@ -634,7 +625,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getLiveMasters</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.359">getLiveMasters</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&gt;&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.338">getLiveMasters</a>()</pre>
 <dl><dt><span class="strong">Returns:</span></dt><dd>List of running master servers (Some servers may have been killed
  or aborted during lifetime of cluster; these servers are not included in
  this list).</dd></dl>
@@ -646,11 +637,9 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>waitOnMaster</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.377">waitOnMaster</a>(int&nbsp;serverNumber)</pre>
-<div class="block">Wait for the specified master to stop
- Removes this thread from list of running threads.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>serverNumber</code> - </dd>
-<dt><span class="strong">Returns:</span></dt><dd>Name of master that just went down.</dd></dl>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.353">waitOnMaster</a>(int&nbsp;serverNumber)</pre>
+<div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>Name of master that just went down.</dd></dl>
 </li>
 </ul>
 <a name="waitOnMaster(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread)">
@@ -659,11 +648,9 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>waitOnMaster</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.396">waitOnMaster</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&nbsp;masterThread)</pre>
-<div class="block">Wait for the specified master to stop
- Removes this thread from list of running threads.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>masterThread</code> - </dd>
-<dt><span class="strong">Returns:</span></dt><dd>Name of master that just went down.</dd></dl>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.362">waitOnMaster</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread&nbsp;masterThread)</pre>
+<div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>Name of master that just went down.</dd></dl>
 </li>
 </ul>
 <a name="join()">
@@ -672,7 +659,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>join</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.419">join</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.379">join</a>()</pre>
 <div class="block">Wait for Mini HBase Cluster to shut down.
  Presumes you've already called <a href="../../../../org/apache/hadoop/hbase/LocalHBaseCluster.html#shutdown()"><code>shutdown()</code></a>.</div>
 </li>
@@ -683,7 +670,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>startup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.447">startup</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.407">startup</a>()
              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">Start the cluster.</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -696,7 +683,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>shutdown</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.454">shutdown</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.414">shutdown</a>()</pre>
 <div class="block">Shut down the mini HBase cluster</div>
 </li>
 </ul>
@@ -706,7 +693,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isLocal</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.462">isLocal</a>(org.apache.hadoop.conf.Configuration&nbsp;c)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.422">isLocal</a>(org.apache.hadoop.conf.Configuration&nbsp;c)</pre>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>c</code> - Configuration to check.</dd>
 <dt><span class="strong">Returns:</span></dt><dd>True if a 'local' address in hbase.master value.</dd></dl>
 </li>
@@ -717,7 +704,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.472">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>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.432">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>[]&nbsp;args)
                  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">Test things basically work.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>args</code> - </dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c221e35e/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html b/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 8d21224..3123f81 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -281,219 +281,179 @@
 <span class="sourceLineNo">273</span>  }<a name="line.273"></a>
 <span class="sourceLineNo">274</span><a name="line.274"></a>
 <span class="sourceLineNo">275</span>  /**<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   * Wait for the specified region server to stop<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   * Removes this thread from list of running threads.<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   * @param serverNumber<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * @return Name of region server that just went down.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   */<a name="line.280"></a>
-<span class="sourceLineNo">281</span>  public String waitOnRegionServer(int serverNumber) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    JVMClusterUtil.RegionServerThread regionServerThread =<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      this.regionThreads.remove(serverNumber);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    while (regionServerThread.isAlive()) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      try {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        LOG.info("Waiting on " +<a name="line.286"></a>
-<span class="sourceLineNo">287</span>          regionServerThread.getRegionServer().toString());<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        regionServerThread.join();<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      } catch (InterruptedException e) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        e.printStackTrace();<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      }<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    return regionServerThread.getName();<a name="line.293"></a>
-<span class="sourceLineNo">294</span>  }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>  /**<a name="line.296"></a>
-<span class="sourceLineNo">297</span>   * Wait for the specified region server to stop<a name="line.297"></a>
-<span class="sourceLineNo">298</span>   * Removes this thread from list of running threads.<a name="line.298"></a>
-<span class="sourceLineNo">299</span>   * @param rst<a name="line.299"></a>
-<span class="sourceLineNo">300</span>   * @return Name of region server that just went down.<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   */<a name="line.301"></a>
-<span class="sourceLineNo">302</span>  public String waitOnRegionServer(JVMClusterUtil.RegionServerThread rst) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    while (rst.isAlive()) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      try {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        LOG.info("Waiting on " +<a name="line.305"></a>
-<span class="sourceLineNo">306</span>          rst.getRegionServer().toString());<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        rst.join();<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      } catch (InterruptedException e) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        e.printStackTrace();<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      }<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    for (int i=0;i&lt;regionThreads.size();i++) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      if (regionThreads.get(i) == rst) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        regionThreads.remove(i);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>        break;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      }<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    }<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    return rst.getName();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>  }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>  /**<a name="line.321"></a>
-<span class="sourceLineNo">322</span>   * @param serverNumber<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   * @return the HMaster thread<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   */<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  public HMaster getMaster(int serverNumber) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    return masterThreads.get(serverNumber).getMaster();<a name="line.326"></a>
-<span class="sourceLineNo">327</span>  }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>  /**<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * Gets the current active master, if available.  If no active master, returns<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   * null.<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   * @return the HMaster for the active master<a name="line.332"></a>
-<span class="sourceLineNo">333</span>   */<a name="line.333"></a>
-<span class="sourceLineNo">334</span>  public HMaster getActiveMaster() {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      if (mt.getMaster().isActiveMaster()) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        // Ensure that the current active master is not stopped.<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        // We don't want to return a stopping master as an active master.<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        if (mt.getMaster().isActiveMaster()  &amp;&amp; !mt.getMaster().isStopped()) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>          return mt.getMaster();<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      }<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    }<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    return null;<a name="line.344"></a>
-<span class="sourceLineNo">345</span>  }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span>  /**<a name="line.347"></a>
-<span class="sourceLineNo">348</span>   * @return Read-only list of master threads.<a name="line.348"></a>
-<span class="sourceLineNo">349</span>   */<a name="line.349"></a>
-<span class="sourceLineNo">350</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getMasters() {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    return Collections.unmodifiableList(this.masterThreads);<a name="line.351"></a>
-<span class="sourceLineNo">352</span>  }<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span>  /**<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * @return List of running master servers (Some servers may have been killed<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * or aborted during lifetime of cluster; these servers are not included in<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * this list).<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   */<a name="line.358"></a>
-<span class="sourceLineNo">359</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getLiveMasters() {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    List&lt;JVMClusterUtil.MasterThread&gt; liveServers =<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      new ArrayList&lt;JVMClusterUtil.MasterThread&gt;();<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    List&lt;JVMClusterUtil.MasterThread&gt; list = getMasters();<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    for (JVMClusterUtil.MasterThread mt: list) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      if (mt.isAlive()) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        liveServers.add(mt);<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    return liveServers;<a name="line.368"></a>
-<span class="sourceLineNo">369</span>  }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>  /**<a name="line.371"></a>
-<span class="sourceLineNo">372</span>   * Wait for the specified master to stop<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   * Removes this thread from list of running threads.<a name="line.373"></a>
-<span class="sourceLineNo">374</span>   * @param serverNumber<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * @return Name of master that just went down.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   */<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  public String waitOnMaster(int serverNumber) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    JVMClusterUtil.MasterThread masterThread = this.masterThreads.remove(serverNumber);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    while (masterThread.isAlive()) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      try {<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        masterThread.join();<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      } catch (InterruptedException e) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>        e.printStackTrace();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      }<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    }<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    return masterThread.getName();<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  }<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span>  /**<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   * Wait for the specified master to stop<a name="line.391"></a>
-<span class="sourceLineNo">392</span>   * Removes this thread from list of running threads.<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   * @param masterThread<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   * @return Name of master that just went down.<a name="line.394"></a>
-<span class="sourceLineNo">395</span>   */<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    while (masterThread.isAlive()) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      try {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>        LOG.info("Waiting on " +<a name="line.399"></a>
-<span class="sourceLineNo">400</span>          masterThread.getMaster().getServerName().toString());<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        masterThread.join();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      } catch (InterruptedException e) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        e.printStackTrace();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      }<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    for (int i=0;i&lt;masterThreads.size();i++) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      if (masterThreads.get(i) == masterThread) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        masterThreads.remove(i);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        break;<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      }<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    }<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    return masterThread.getName();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>  }<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span>  /**<a name="line.415"></a>
-<span class="sourceLineNo">416</span>   * Wait for Mini HBase Cluster to shut down.<a name="line.416"></a>
-<span class="sourceLineNo">417</span>   * Presumes you've already called {@link #shutdown()}.<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   */<a name="line.418"></a>
-<span class="sourceLineNo">419</span>  public void join() {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    if (this.regionThreads != null) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      for(Thread t: this.regionThreads) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>        if (t.isAlive()) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>          try {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>            Threads.threadDumpingIsAlive(t);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>          } catch (InterruptedException e) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>            LOG.debug("Interrupted", e);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>          }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        }<a name="line.428"></a>
-<span class="sourceLineNo">429</span>      }<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    }<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    if (this.masterThreads != null) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>      for (Thread t : this.masterThreads) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        if (t.isAlive()) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>          try {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>            Threads.threadDumpingIsAlive(t);<a name="line.435"></a>
-<span class="sourceLineNo">436</span>          } catch (InterruptedException e) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>            LOG.debug("Interrupted", e);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>          }<a name="line.438"></a>
-<span class="sourceLineNo">439</span>        }<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      }<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    }<a name="line.441"></a>
-<span class="sourceLineNo">442</span>  }<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span>  /**<a name="line.444"></a>
-<span class="sourceLineNo">445</span>   * Start the cluster.<a name="line.445"></a>
-<span class="sourceLineNo">446</span>   */<a name="line.446"></a>
-<span class="sourceLineNo">447</span>  public void startup() throws IOException {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.448"></a>
-<span class="sourceLineNo">449</span>  }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>  /**<a name="line.451"></a>
-<span class="sourceLineNo">452</span>   * Shut down the mini HBase cluster<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   */<a name="line.453"></a>
-<span class="sourceLineNo">454</span>  public void shutdown() {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.455"></a>
-<span class="sourceLineNo">456</span>  }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span>  /**<a name="line.458"></a>
-<span class="sourceLineNo">459</span>   * @param c Configuration to check.<a name="line.459"></a>
-<span class="sourceLineNo">460</span>   * @return True if a 'local' address in hbase.master value.<a name="line.460"></a>
-<span class="sourceLineNo">461</span>   */<a name="line.461"></a>
-<span class="sourceLineNo">462</span>  public static boolean isLocal(final Configuration c) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>  }<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>  /**<a name="line.467"></a>
-<span class="sourceLineNo">468</span>   * Test things basically work.<a name="line.468"></a>
-<span class="sourceLineNo">469</span>   * @param args<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   * @throws IOException<a name="line.470"></a>
-<span class="sourceLineNo">471</span>   */<a name="line.471"></a>
-<span class="sourceLineNo">472</span>  public static void main(String[] args) throws IOException {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    Configuration conf = HBaseConfiguration.create();<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    cluster.startup();<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    Connection connection = ConnectionFactory.createConnection(conf);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    Admin admin = connection.getAdmin();<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    try {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      HTableDescriptor htd =<a name="line.479"></a>
-<span class="sourceLineNo">480</span>        new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      admin.createTable(htd);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    } finally {<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      admin.close();<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    }<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    connection.close();<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    cluster.shutdown();<a name="line.486"></a>
-<span class="sourceLineNo">487</span>  }<a name="line.487"></a>
-<span class="sourceLineNo">488</span>}<a name="line.488"></a>
+<span class="sourceLineNo">276</span>   * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   * @return Name of region server that just went down.<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   */<a name="line.278"></a>
+<span class="sourceLineNo">279</span>  public String waitOnRegionServer(int serverNumber) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    JVMClusterUtil.RegionServerThread regionServerThread = this.regionThreads.get(serverNumber);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    return waitOnRegionServer(regionServerThread);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>  }<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span>  /**<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * @return Name of region server that just went down.<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   */<a name="line.287"></a>
+<span class="sourceLineNo">288</span>  public String waitOnRegionServer(JVMClusterUtil.RegionServerThread rst) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    while (rst.isAlive()) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      try {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        LOG.info("Waiting on " + rst.getRegionServer().toString());<a name="line.291"></a>
+<span class="sourceLineNo">292</span>        rst.join();<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      } catch (InterruptedException e) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>        e.printStackTrace();<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    regionThreads.remove(rst);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    return rst.getName();<a name="line.298"></a>
+<span class="sourceLineNo">299</span>  }<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>  /**<a name="line.301"></a>
+<span class="sourceLineNo">302</span>   * @return the HMaster thread<a name="line.302"></a>
+<span class="sourceLineNo">303</span>   */<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  public HMaster getMaster(int serverNumber) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    return masterThreads.get(serverNumber).getMaster();<a name="line.305"></a>
+<span class="sourceLineNo">306</span>  }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span>  /**<a name="line.308"></a>
+<span class="sourceLineNo">309</span>   * Gets the current active master, if available.  If no active master, returns<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   * null.<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   * @return the HMaster for the active master<a name="line.311"></a>
+<span class="sourceLineNo">312</span>   */<a name="line.312"></a>
+<span class="sourceLineNo">313</span>  public HMaster getActiveMaster() {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      if (mt.getMaster().isActiveMaster()) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        // Ensure that the current active master is not stopped.<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        // We don't want to return a stopping master as an active master.<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        if (mt.getMaster().isActiveMaster()  &amp;&amp; !mt.getMaster().isStopped()) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>          return mt.getMaster();<a name="line.319"></a>
+<span class="sourceLineNo">320</span>        }<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      }<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    return null;<a name="line.323"></a>
+<span class="sourceLineNo">324</span>  }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>  /**<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   * @return Read-only list of master threads.<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   */<a name="line.328"></a>
+<span class="sourceLineNo">329</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getMasters() {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    return Collections.unmodifiableList(this.masterThreads);<a name="line.330"></a>
+<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>  /**<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   * @return List of running master servers (Some servers may have been killed<a name="line.334"></a>
+<span class="sourceLineNo">335</span>   * or aborted during lifetime of cluster; these servers are not included in<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   * this list).<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   */<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getLiveMasters() {<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    List&lt;JVMClusterUtil.MasterThread&gt; liveServers = new ArrayList&lt;&gt;();<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    List&lt;JVMClusterUtil.MasterThread&gt; list = getMasters();<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    for (JVMClusterUtil.MasterThread mt: list) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      if (mt.isAlive()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        liveServers.add(mt);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      }<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    }<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    return liveServers;<a name="line.346"></a>
+<span class="sourceLineNo">347</span>  }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>  /**<a name="line.349"></a>
+<span class="sourceLineNo">350</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.350"></a>
+<span class="sourceLineNo">351</span>   * @return Name of master that just went down.<a name="line.351"></a>
+<span class="sourceLineNo">352</span>   */<a name="line.352"></a>
+<span class="sourceLineNo">353</span>  public String waitOnMaster(int serverNumber) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    return waitOnMaster(masterThread);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>  }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>  /**<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * @return Name of master that just went down.<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   */<a name="line.361"></a>
+<span class="sourceLineNo">362</span>  public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    while (masterThread.isAlive()) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>      try {<a name="line.364"></a>
+<span class="sourceLineNo">365</span>        LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.365"></a>
+<span class="sourceLineNo">366</span>        masterThread.join();<a name="line.366"></a>
+<span class="sourceLineNo">367</span>      } catch (InterruptedException e) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        e.printStackTrace();<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    }<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    masterThreads.remove(masterThread);<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    return masterThread.getName();<a name="line.372"></a>
+<span class="sourceLineNo">373</span>  }<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span>  /**<a name="line.375"></a>
+<span class="sourceLineNo">376</span>   * Wait for Mini HBase Cluster to shut down.<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   * Presumes you've already called {@link #shutdown()}.<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   */<a name="line.378"></a>
+<span class="sourceLineNo">379</span>  public void join() {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    if (this.regionThreads != null) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      for(Thread t: this.regionThreads) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        if (t.isAlive()) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>          try {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            Threads.threadDumpingIsAlive(t);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>          } catch (InterruptedException e) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>            LOG.debug("Interrupted", e);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>          }<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      }<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    if (this.masterThreads != null) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      for (Thread t : this.masterThreads) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        if (t.isAlive()) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>          try {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            Threads.threadDumpingIsAlive(t);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>          } catch (InterruptedException e) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>            LOG.debug("Interrupted", e);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>          }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        }<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      }<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>  }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span>  /**<a name="line.404"></a>
+<span class="sourceLineNo">405</span>   * Start the cluster.<a name="line.405"></a>
+<span class="sourceLineNo">406</span>   */<a name="line.406"></a>
+<span class="sourceLineNo">407</span>  public void startup() throws IOException {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.408"></a>
+<span class="sourceLineNo">409</span>  }<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span>  /**<a name="line.411"></a>
+<span class="sourceLineNo">412</span>   * Shut down the mini HBase cluster<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   */<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  public void shutdown() {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.415"></a>
+<span class="sourceLineNo">416</span>  }<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span>  /**<a name="line.418"></a>
+<span class="sourceLineNo">419</span>   * @param c Configuration to check.<a name="line.419"></a>
+<span class="sourceLineNo">420</span>   * @return True if a 'local' address in hbase.master value.<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   */<a name="line.421"></a>
+<span class="sourceLineNo">422</span>  public static boolean isLocal(final Configuration c) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.424"></a>
+<span class="sourceLineNo">425</span>  }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span>  /**<a name="line.427"></a>
+<span class="sourceLineNo">428</span>   * Test things basically work.<a name="line.428"></a>
+<span class="sourceLineNo">429</span>   * @param args<a name="line.429"></a>
+<span class="sourceLineNo">430</span>   * @throws IOException<a name="line.430"></a>
+<span class="sourceLineNo">431</span>   */<a name="line.431"></a>
+<span class="sourceLineNo">432</span>  public static void main(String[] args) throws IOException {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    Configuration conf = HBaseConfiguration.create();<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    cluster.startup();<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    Connection connection = ConnectionFactory.createConnection(conf);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    Admin admin = connection.getAdmin();<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    try {<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      HTableDescriptor htd =<a name="line.439"></a>
+<span class="sourceLineNo">440</span>        new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      admin.createTable(htd);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    } finally {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      admin.close();<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    connection.close();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    cluster.shutdown();<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  }<a name="line.447"></a>
+<span class="sourceLineNo">448</span>}<a name="line.448"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c221e35e/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index a06ecf1..36e1772 100644
--- a/book.html
+++ b/book.html
@@ -32933,7 +32933,7 @@ The server will return cellblocks compressed using this same compressor as long
 <div id="footer">
 <div id="footer-text">
 Version 2.0.0-SNAPSHOT<br>
-Last updated 2016-01-24 14:56:38 UTC
+Last updated 2016-01-26 14:51:48 UTC
 </div>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c221e35e/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index 9431167..ff418cf 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160124" />
+    <meta name="Date-Revision-yyyymmdd" content="20160126" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Bulk Loads in Apache HBase (TM)
@@ -305,7 +305,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-24</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-26</li>
             </p>
                 </div>
 


Mime
View raw message