You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/02/17 18:36:17 UTC
[13/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/metrics.html
----------------------------------------------------------------------
diff --git a/metrics.html b/metrics.html
index 548c82f..28023b3 100644
--- a/metrics.html
+++ b/metrics.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Metrics
@@ -458,7 +458,7 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/modules.html
----------------------------------------------------------------------
diff --git a/modules.html b/modules.html
index 6e3b13a..6513cc2 100644
--- a/modules.html
+++ b/modules.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Modules</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -366,7 +366,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/old_news.html
----------------------------------------------------------------------
diff --git a/old_news.html b/old_news.html
index c8b8804..2e336d5 100644
--- a/old_news.html
+++ b/old_news.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Old Apache HBase (TM) News
@@ -413,7 +413,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-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/plugin-management.html
----------------------------------------------------------------------
diff --git a/plugin-management.html b/plugin-management.html
index ab4f9ba..14ba158 100644
--- a/plugin-management.html
+++ b/plugin-management.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Plugin Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -423,7 +423,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
index 4ee257a..3b017f2 100644
--- a/plugins.html
+++ b/plugins.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Build Plugins</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -366,7 +366,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/poweredbyhbase.html
----------------------------------------------------------------------
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index 14915b5..67fd92a 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Powered By Apache HBase</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -768,7 +768,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-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/project-info.html
----------------------------------------------------------------------
diff --git a/project-info.html b/project-info.html
index eb8dc33..b85c233 100644
--- a/project-info.html
+++ b/project-info.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -340,7 +340,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/project-reports.html
----------------------------------------------------------------------
diff --git a/project-reports.html b/project-reports.html
index f6c82d2..8f9388c 100644
--- a/project-reports.html
+++ b/project-reports.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Generated Reports</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -310,7 +310,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/project-summary.html
----------------------------------------------------------------------
diff --git a/project-summary.html b/project-summary.html
index ccc2c34..4e93c8e 100644
--- a/project-summary.html
+++ b/project-summary.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Summary</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -330,7 +330,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/pseudo-distributed.html
----------------------------------------------------------------------
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index bed0bba..8d0f50a 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Running Apache HBase (TM) in pseudo-distributed mode
@@ -307,7 +307,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-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/replication.html
----------------------------------------------------------------------
diff --git a/replication.html b/replication.html
index 9ecd9fe..2ee4f87 100644
--- a/replication.html
+++ b/replication.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Replication
@@ -302,7 +302,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-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/resources.html
----------------------------------------------------------------------
diff --git a/resources.html b/resources.html
index 5d30d9b..8af09c8 100644
--- a/resources.html
+++ b/resources.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Other Apache HBase (TM) Resources</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -324,7 +324,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-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/source-repository.html
----------------------------------------------------------------------
diff --git a/source-repository.html b/source-repository.html
index db06d37..58e0a46 100644
--- a/source-repository.html
+++ b/source-repository.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Source Repository</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -298,7 +298,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index 33ef6f4..015949e 100644
--- a/sponsors.html
+++ b/sponsors.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase Sponsors</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -332,7 +332,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-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index 3995399..4d8376b 100644
--- a/supportingprojects.html
+++ b/supportingprojects.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Supporting Projects</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -519,7 +519,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-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index 9511672..c779389 100644
--- a/team-list.html
+++ b/team-list.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="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Team list</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -785,7 +785,7 @@ window.onLoad = init();
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 9713a82..63d37cd 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -670,7 +670,7 @@
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.html#admin">admin</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.html" title="class in org.apache.hadoop.hbase.regionserver">TestMobStoreScanner</a></dt>
<dd> </dd>
-<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#admin">admin</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#ADMIN">ADMIN</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestSplitTransactionOnCluster</a></dt>
<dd> </dd>
@@ -682,6 +682,8 @@
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestExportSnapshot.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestExportSnapshot.html" title="class in org.apache.hadoop.hbase.snapshot">TestExportSnapshot</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html" title="class in org.apache.hadoop.hbase.snapshot">TestFlushSnapshotFromClient</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.html" title="class in org.apache.hadoop.hbase.snapshot">TestRestoreFlushSnapshotFromClient</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/TestMultiVersions.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/TestMultiVersions.html" title="class in org.apache.hadoop.hbase">TestMultiVersions</a></dt>
@@ -16933,7 +16935,7 @@
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/procedure/SimpleMasterProcedureManager.html#master">master</a></span> - Variable in class org.apache.hadoop.hbase.procedure.<a href="./org/apache/hadoop/hbase/procedure/SimpleMasterProcedureManager.html" title="class in org.apache.hadoop.hbase.procedure">SimpleMasterProcedureManager</a></dt>
<dd> </dd>
-<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#master">master</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#MASTER">MASTER</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html#master">master</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionServerReportForDuty</a></dt>
<dd> </dd>
@@ -46849,16 +46851,22 @@
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionIncrement.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionIncrement.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionIncrement</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestScanner.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestScanner.html" title="class in org.apache.hadoop.hbase.regionserver">TestScanner</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.wal.<a href="./org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.html" title="class in org.apache.hadoop.hbase.regionserver.wal">TestLogRollingNoCluster</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestExportSnapshot.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestExportSnapshot.html" title="class in org.apache.hadoop.hbase.snapshot">TestExportSnapshot</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html" title="class in org.apache.hadoop.hbase.snapshot">TestFlushSnapshotFromClient</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.html" title="class in org.apache.hadoop.hbase.snapshot">TestSecureExportSnapshot</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.TimeBoundedMultiThreadedReader.TimeoutThread.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.test.<a href="./org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.TimeBoundedMultiThreadedReader.TimeoutThread.html" title="class in org.apache.hadoop.hbase.test">IntegrationTestTimeBoundedRequestsWithRegionReplicas.TimeBoundedMultiThreadedReader.TimeoutThread</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html" title="class in org.apache.hadoop.hbase">TestIPv6NIOServerSocketChannel</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/TestTimeout.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/TestTimeout.html" title="class in org.apache.hadoop.hbase">TestTimeout</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.html#TIMEOUT_KEY">TIMEOUT_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.html" title="class in org.apache.hadoop.hbase">IntegrationTestLazyCfLoading</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html b/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
index 137e89a..f4f2a7b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
@@ -95,7 +95,7 @@
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.48">TestIPv6NIOServerSocketChannel</a>
+<pre>public class <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.50">TestIPv6NIOServerSocketChannel</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">This tests whether ServerSocketChannel works over ipv6, which Zookeeper
depends on. On Windows Oracle JDK 6, creating a ServerSocketChannel throws
@@ -128,6 +128,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<td class="colFirst"><code>private static org.apache.commons.logging.Log</code></td>
<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#LOG">LOG</a></strong></code> </td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>org.junit.rules.TestRule</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#timeout">timeout</a></strong></code> </td>
+</tr>
</table>
</li>
</ul>
@@ -222,10 +226,19 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<a name="LOG">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.apache.commons.logging.Log <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.50">LOG</a></pre>
+<pre>private static final org.apache.commons.logging.Log <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.52">LOG</a></pre>
+</li>
+</ul>
+<a name="timeout">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>timeout</h4>
+<pre>public final org.junit.rules.TestRule <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.55">timeout</a></pre>
</li>
</ul>
</li>
@@ -242,7 +255,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>TestIPv6NIOServerSocketChannel</h4>
-<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.48">TestIPv6NIOServerSocketChannel</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.50">TestIPv6NIOServerSocketChannel</a>()</pre>
</li>
</ul>
</li>
@@ -259,7 +272,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>bindServerSocket</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.55">bindServerSocket</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a> inetAddr)
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.60">bindServerSocket</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a> inetAddr)
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">Creates and binds a regular ServerSocket.</div>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -272,7 +285,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>bindNIOServerSocket</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.80">bindNIOServerSocket</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a> inetAddr)
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.85">bindNIOServerSocket</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a> inetAddr)
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">Creates a NIO ServerSocketChannel, and gets the ServerSocket from
there. Then binds the obtained socket.
@@ -288,7 +301,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testServerSocket</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.109">testServerSocket</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.114">testServerSocket</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">Checks whether we are effected by the JDK issue on windows, and if so
ensures that we are running with preferIPv4Stack=true.</div>
@@ -302,7 +315,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ensurePreferIPv4</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.134">ensurePreferIPv4</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.139">ensurePreferIPv4</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">Checks whether we are running with java.net.preferIPv4Stack=true</div>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -315,7 +328,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testServerSocketFromLocalhostResolution</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.147">testServerSocketFromLocalhostResolution</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.152">testServerSocketFromLocalhostResolution</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">Tests whether every InetAddress we obtain by resolving can open a
ServerSocketChannel.</div>
@@ -329,7 +342,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 void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.156">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/TestIPv6NIOServerSocketChannel.html#line.161">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>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><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></code></dd></dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index e4cce93..c423f10 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -157,8 +157,8 @@
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestCacheOnWrite.CacheOnWriteType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TagUsage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestHFileBlockCompatibility.Writer.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TagUsage</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 4f3156d..00dd4d2 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -515,16 +515,16 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.RoleCommand</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestRegionServerMetrics.Metric.html" title="enum in org.apache.hadoop.hbase"><span class="strong">TestRegionServerMetrics.Metric</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HBaseClusterManager.CommandProvider.Operation</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ScanPerformanceEvaluation.ScanCounter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestRegionServerMetrics.Metric.html" title="enum in org.apache.hadoop.hbase"><span class="strong">TestRegionServerMetrics.Metric</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.RoleCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.Service</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ResourceChecker.Phase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.Service</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index f45510d..b6de721 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -145,8 +145,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
index 86f2968..a7e259c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
@@ -118,7 +118,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.509">TestRegionMergeTransactionOnCluster.MyMaster</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.513">TestRegionMergeTransactionOnCluster.MyMaster</a>
extends org.apache.hadoop.hbase.master.HMaster</pre>
</li>
</ul>
@@ -288,7 +288,7 @@ extends org.apache.hadoop.hbase.master.HMaster</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>TestRegionMergeTransactionOnCluster.MyMaster</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html#line.510">TestRegionMergeTransactionOnCluster.MyMaster</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html#line.514">TestRegionMergeTransactionOnCluster.MyMaster</a>(org.apache.hadoop.conf.Configuration conf,
org.apache.hadoop.hbase.CoordinatedStateManager cp)
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>,
org.apache.zookeeper.KeeperException,
@@ -313,7 +313,7 @@ extends org.apache.hadoop.hbase.master.HMaster</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>createRpcServices</h4>
-<pre>protected org.apache.hadoop.hbase.regionserver.RSRpcServices <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html#line.517">createRpcServices</a>()
+<pre>protected org.apache.hadoop.hbase.regionserver.RSRpcServices <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html#line.521">createRpcServices</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>
<dl>
<dt><strong>Overrides:</strong></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
index b5060ce..adf519b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
@@ -113,7 +113,7 @@
</dl>
<hr>
<br>
-<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.522">TestRegionMergeTransactionOnCluster.MyMasterRpcServices</a>
+<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.526">TestRegionMergeTransactionOnCluster.MyMasterRpcServices</a>
extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
</li>
</ul>
@@ -242,7 +242,7 @@ extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
<ul class="blockList">
<li class="blockList">
<h4>enabled</h4>
-<pre>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicBoolean</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.523">enabled</a></pre>
+<pre>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicBoolean</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.527">enabled</a></pre>
</li>
</ul>
<a name="myMaster">
@@ -251,7 +251,7 @@ extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>myMaster</h4>
-<pre>private org.apache.hadoop.hbase.master.HMaster <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.525">myMaster</a></pre>
+<pre>private org.apache.hadoop.hbase.master.HMaster <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.529">myMaster</a></pre>
</li>
</ul>
</li>
@@ -268,7 +268,7 @@ extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>TestRegionMergeTransactionOnCluster.MyMasterRpcServices</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.526">TestRegionMergeTransactionOnCluster.MyMasterRpcServices</a>(org.apache.hadoop.hbase.master.HMaster master)
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.530">TestRegionMergeTransactionOnCluster.MyMasterRpcServices</a>(org.apache.hadoop.hbase.master.HMaster master)
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>
<dl><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>
@@ -288,7 +288,7 @@ extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>reportRegionStateTransition</h4>
-<pre>public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.532">reportRegionStateTransition</a>(com.google.protobuf.RpcController c,
+<pre>public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.536">reportRegionStateTransition</a>(com.google.protobuf.RpcController c,
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest req)
throws com.google.protobuf.ServiceException</pre>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
index fcbd194..eda87b5 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
@@ -95,7 +95,7 @@
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.91">TestRegionMergeTransactionOnCluster</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.94">TestRegionMergeTransactionOnCluster</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">Like <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.html" title="class in org.apache.hadoop.hbase.regionserver"><code>TestRegionMergeTransaction</code></a> in that we're testing
<code>RegionMergeTransactionImpl</code> only the below tests are against a running
@@ -144,7 +144,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr class="altColor">
<td class="colFirst"><code>private static org.apache.hadoop.hbase.client.Admin</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#admin">admin</a></strong></code> </td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#ADMIN">ADMIN</a></strong></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private static byte[]</code></td>
@@ -160,7 +160,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr class="altColor">
<td class="colFirst"><code>private static org.apache.hadoop.hbase.master.HMaster</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#master">master</a></strong></code> </td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#MASTER">MASTER</a></strong></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private static int</code></td>
@@ -187,6 +187,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#TEST_UTIL">TEST_UTIL</a></strong></code> </td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>org.junit.rules.TestRule</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#timeout">timeout</a></strong></code> </td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code>private static int</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#waitTime">waitTime</a></strong></code> </td>
</tr>
@@ -330,7 +334,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.92">LOG</a></pre>
+<pre>private static final org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.95">LOG</a></pre>
+</li>
+</ul>
+<a name="timeout">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>timeout</h4>
+<pre>public final org.junit.rules.TestRule <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.97">timeout</a></pre>
</li>
</ul>
<a name="NB_SERVERS">
@@ -339,7 +352,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>NB_SERVERS</h4>
-<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.94">NB_SERVERS</a></pre>
+<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.99">NB_SERVERS</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.regionserver.TestRegionMergeTransactionOnCluster.NB_SERVERS">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -349,7 +362,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>FAMILYNAME</h4>
-<pre>private static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.96">FAMILYNAME</a></pre>
+<pre>private static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.101">FAMILYNAME</a></pre>
</li>
</ul>
<a name="QUALIFIER">
@@ -358,7 +371,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>QUALIFIER</h4>
-<pre>private static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.97">QUALIFIER</a></pre>
+<pre>private static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.102">QUALIFIER</a></pre>
</li>
</ul>
<a name="ROW">
@@ -367,7 +380,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ROW</h4>
-<pre>private static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.99">ROW</a></pre>
+<pre>private static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.104">ROW</a></pre>
</li>
</ul>
<a name="INITIAL_REGION_NUM">
@@ -376,7 +389,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>INITIAL_REGION_NUM</h4>
-<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.100">INITIAL_REGION_NUM</a></pre>
+<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.105">INITIAL_REGION_NUM</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.regionserver.TestRegionMergeTransactionOnCluster.INITIAL_REGION_NUM">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -386,7 +399,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ROWSIZE</h4>
-<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.101">ROWSIZE</a></pre>
+<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.106">ROWSIZE</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.regionserver.TestRegionMergeTransactionOnCluster.ROWSIZE">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -396,7 +409,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ROWS</h4>
-<pre>private static byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.102">ROWS</a></pre>
+<pre>private static byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.107">ROWS</a></pre>
</li>
</ul>
<a name="waitTime">
@@ -405,7 +418,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>waitTime</h4>
-<pre>private static int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.104">waitTime</a></pre>
+<pre>private static int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.109">waitTime</a></pre>
</li>
</ul>
<a name="TEST_UTIL">
@@ -414,25 +427,25 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>TEST_UTIL</h4>
-<pre>static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.106">TEST_UTIL</a></pre>
+<pre>static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.111">TEST_UTIL</a></pre>
</li>
</ul>
-<a name="master">
+<a name="MASTER">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>master</h4>
-<pre>private static org.apache.hadoop.hbase.master.HMaster <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.108">master</a></pre>
+<h4>MASTER</h4>
+<pre>private static org.apache.hadoop.hbase.master.HMaster <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.113">MASTER</a></pre>
</li>
</ul>
-<a name="admin">
+<a name="ADMIN">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>admin</h4>
-<pre>private static org.apache.hadoop.hbase.client.Admin <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.109">admin</a></pre>
+<h4>ADMIN</h4>
+<pre>private static org.apache.hadoop.hbase.client.Admin <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.114">ADMIN</a></pre>
</li>
</ul>
</li>
@@ -449,7 +462,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>TestRegionMergeTransactionOnCluster</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.91">TestRegionMergeTransactionOnCluster</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.94">TestRegionMergeTransactionOnCluster</a>()</pre>
</li>
</ul>
</li>
@@ -466,7 +479,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>beforeAllTests</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.112">beforeAllTests</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.117">beforeAllTests</a>()
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>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><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></code></dd></dl>
@@ -478,7 +491,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>afterAllTests</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.122">afterAllTests</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.127">afterAllTests</a>()
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>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><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></code></dd></dl>
@@ -490,7 +503,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testWholesomeMerge</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.127">testWholesomeMerge</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.133">testWholesomeMerge</a>()
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>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><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></code></dd></dl>
@@ -502,7 +515,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testMergeAndRestartingMaster</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.178">testMergeAndRestartingMaster</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.184">testMergeAndRestartingMaster</a>()
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">Not really restarting the master. Simulate it by clear of new region
state since it is not persisted, will be lost after master restarts.</div>
@@ -516,7 +529,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testCleanMergeReference</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.200">testCleanMergeReference</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.204">testCleanMergeReference</a>()
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>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><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></code></dd></dl>
@@ -528,7 +541,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testMerge</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.312">testMerge</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.316">testMerge</a>()
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">This test tests 1, merging region not online;
2, merging same two regions; 3, merging unknown regions.
@@ -544,7 +557,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testMergeWithReplicas</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.359">testMergeWithReplicas</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.363">testMergeWithReplicas</a>()
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>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><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></code></dd></dl>
@@ -556,7 +569,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>mergeRegionsAndVerifyRegionNum</h4>
-<pre>private org.apache.hadoop.hbase.util.PairOfSameType<org.apache.hadoop.hbase.HRegionInfo> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.397">mergeRegionsAndVerifyRegionNum</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private org.apache.hadoop.hbase.util.PairOfSameType<org.apache.hadoop.hbase.HRegionInfo> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.401">mergeRegionsAndVerifyRegionNum</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename,
int regionAnum,
int regionBnum,
@@ -572,7 +585,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>requestMergeRegion</h4>
-<pre>private org.apache.hadoop.hbase.util.PairOfSameType<org.apache.hadoop.hbase.HRegionInfo> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.406">requestMergeRegion</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private org.apache.hadoop.hbase.util.PairOfSameType<org.apache.hadoop.hbase.HRegionInfo> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.410">requestMergeRegion</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename,
int regionAnum,
int regionBnum)
@@ -587,7 +600,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>waitAndVerifyRegionNum</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.420">waitAndVerifyRegionNum</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.424">waitAndVerifyRegionNum</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename,
int expectedRegionNum)
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>
@@ -601,7 +614,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>createTableAndLoadData</h4>
-<pre>private org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.443">createTableAndLoadData</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.447">createTableAndLoadData</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename)
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>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -614,7 +627,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>createTableAndLoadData</h4>
-<pre>private org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.448">createTableAndLoadData</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.452">createTableAndLoadData</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename,
int numRegions,
int replication)
@@ -629,7 +642,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>makeN</h4>
-<pre>private static byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.481">makeN</a>(byte[] base,
+<pre>private static byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.485">makeN</a>(byte[] base,
int n)</pre>
</li>
</ul>
@@ -639,7 +652,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>loadData</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.489">loadData</a>(org.apache.hadoop.hbase.client.Table table)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.493">loadData</a>(org.apache.hadoop.hbase.client.Table table)
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>
<dl><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>
@@ -651,7 +664,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>verifyRowCount</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.497">verifyRowCount</a>(org.apache.hadoop.hbase.client.Table table,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.501">verifyRowCount</a>(org.apache.hadoop.hbase.client.Table table,
int expectedRegionNum)
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>
<dl><dt><span class="strong">Throws:</span></dt>