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/04/18 23:05:29 UTC
[49/51] [partial] hbase-site git commit: Published site at
f2e0aca2b6925cdd1f2896052f4b4e847ee4e1fd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/class-use/TableName.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/class-use/TableName.html b/apidocs/org/apache/hadoop/hbase/class-use/TableName.html
index e032379..dfe0e2d 100644
--- a/apidocs/org/apache/hadoop/hbase/class-use/TableName.html
+++ b/apidocs/org/apache/hadoop/hbase/class-use/TableName.html
@@ -397,14 +397,14 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a></code></td>
-<td class="colLast"><span class="strong">BufferedMutator.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#getName()">getName</a></strong>()</code>
-<div class="block">Gets the fully qualified table name instance of the table that this BufferedMutator writes to.</div>
+<td class="colLast"><span class="strong">Table.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getName()">getName</a></strong>()</code>
+<div class="block">Gets the fully qualified table name instance of this table.</div>
</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a></code></td>
-<td class="colLast"><span class="strong">Table.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Table.html#getName()">getName</a></strong>()</code>
-<div class="block">Gets the fully qualified table name instance of this table.</div>
+<td class="colLast"><span class="strong">BufferedMutator.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/BufferedMutator.html#getName()">getName</a></strong>()</code>
+<div class="block">Gets the fully qualified table name instance of the table that this BufferedMutator writes to.</div>
</td>
</tr>
<tr class="rowColor">
@@ -413,18 +413,18 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>[]</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#listTableNames()">listTableNames</a></strong>()</code>
-<div class="block">List all of the names of userspace tables.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>[]</code></td>
<td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HConnection.html#listTableNames()">listTableNames</a></strong>()</code>
<div class="block"><strong>Deprecated.</strong>
<div class="block"><i>Use <a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#listTables()"><code>Admin.listTables()</code></a> instead.</i></div>
</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>[]</code></td>
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#listTableNames()">listTableNames</a></strong>()</code>
+<div class="block">List all of the names of userspace tables.</div>
+</td>
+</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>[]</code></td>
<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#listTableNames(java.util.regex.Pattern)">listTableNames</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html?is-external=true" title="class or interface in java.util.regex">Pattern</a> pattern)</code>
@@ -728,23 +728,15 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#isTableAvailable(org.apache.hadoop.hbase.TableName)">isTableAvailable</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HConnection.html#isTableAvailable(org.apache.hadoop.hbase.TableName)">isTableAvailable</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code>
<div class="block"><strong>Deprecated.</strong> </div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#isTableAvailable(org.apache.hadoop.hbase.TableName,%20byte[][])">isTableAvailable</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
- byte[][] splitKeys)</code>
-<div class="block">Use this api to check if the table has been created with the specified number of splitkeys
- which was used while creating the given table.</div>
-</td>
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#isTableAvailable(org.apache.hadoop.hbase.TableName)">isTableAvailable</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HConnection.html#isTableAvailable(org.apache.hadoop.hbase.TableName,%20byte[][])">isTableAvailable</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] splitKeys)</code>
@@ -753,21 +745,25 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#isTableDisabled(org.apache.hadoop.hbase.TableName)">isTableDisabled</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#isTableAvailable(org.apache.hadoop.hbase.TableName,%20byte[][])">isTableAvailable</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
+ byte[][] splitKeys)</code>
+<div class="block">Use this api to check if the table has been created with the specified number of splitkeys
+ which was used while creating the given table.</div>
+</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HConnection.html#isTableDisabled(org.apache.hadoop.hbase.TableName)">isTableDisabled</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code>
<div class="block"><strong>Deprecated.</strong> </div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#isTableEnabled(org.apache.hadoop.hbase.TableName)">isTableEnabled</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#isTableDisabled(org.apache.hadoop.hbase.TableName)">isTableDisabled</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HConnection.html#isTableEnabled(org.apache.hadoop.hbase.TableName)">isTableEnabled</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code>
<div class="block"><strong>Deprecated.</strong> </div>
@@ -775,6 +771,10 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
is possible.</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#isTableEnabled(org.apache.hadoop.hbase.TableName)">isTableEnabled</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
+</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/HRegionLocation.html" title="class in org.apache.hadoop.hbase">HRegionLocation</a></code></td>
<td class="colLast"><span class="strong">HConnection.</span><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/HConnection.html#locateRegion(org.apache.hadoop.hbase.TableName,%20byte[])">locateRegion</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html b/apidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html
index fcaa208..d6537e0 100644
--- a/apidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html
+++ b/apidocs/org/apache/hadoop/hbase/client/Admin.CompactType.html
@@ -110,7 +110,7 @@
<br>
<pre>@InterfaceAudience.Public
@InterfaceStability.Unstable
-public static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1739">Admin.CompactType</a>
+public static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1752">Admin.CompactType</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a><<a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a>></pre>
<div class="block">Currently, there are only two compact types:
<code>NORMAL</code> means do store files compaction;
@@ -201,7 +201,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>NORMAL</h4>
-<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html#line.1741">NORMAL</a></pre>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html#line.1754">NORMAL</a></pre>
</li>
</ul>
<a name="MOB">
@@ -210,7 +210,7 @@ the order they are declared.</div>
<ul class="blockListLast">
<li class="blockList">
<h4>MOB</h4>
-<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html#line.1742">MOB</a></pre>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client">Admin.CompactType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html#line.1755">MOB</a></pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html b/apidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html
index 6175ffa..00c3ef4 100644
--- a/apidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html
+++ b/apidocs/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html
@@ -110,7 +110,7 @@
<br>
<pre>@InterfaceAudience.Public
@InterfaceStability.Evolving
-public static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1749">Admin.MasterSwitchType</a>
+public static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1762">Admin.MasterSwitchType</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a><<a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>></pre>
</li>
</ul>
@@ -198,7 +198,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>SPLIT</h4>
-<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.1750">SPLIT</a></pre>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.1763">SPLIT</a></pre>
</li>
</ul>
<a name="MERGE">
@@ -207,7 +207,7 @@ the order they are declared.</div>
<ul class="blockListLast">
<li class="blockList">
<h4>MERGE</h4>
-<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.1751">MERGE</a></pre>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.1764">MERGE</a></pre>
</li>
</ul>
</li>
@@ -224,7 +224,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>values</h4>
-<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.29">values</a>()</pre>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.9">values</a>()</pre>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared. This method may be used to iterate
over the constants as follows:
@@ -241,7 +241,7 @@ for (Admin.MasterSwitchType c : Admin.MasterSwitchType.values())
<ul class="blockListLast">
<li class="blockList">
<h4>valueOf</h4>
-<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.29">valueOf</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> name)</pre>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html#line.9">valueOf</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> name)</pre>
<div class="block">Returns the enum constant of this type with the specified name.
The string must match <i>exactly</i> an identifier used to declare an
enum constant in this type. (Extraneous whitespace characters are
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/Admin.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/Admin.html b/apidocs/org/apache/hadoop/hbase/client/Admin.html
index c0a0b26..f6dea0f 100644
--- a/apidocs/org/apache/hadoop/hbase/client/Admin.html
+++ b/apidocs/org/apache/hadoop/hbase/client/Admin.html
@@ -959,102 +959,112 @@ extends org.apache.hadoop.hbase.Abortable, <a href="http://docs.oracle.com/javas
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#releaseSplitOrMergeLockAndRollback()">releaseSplitOrMergeLockAndRollback</a></strong>()</code>
+<div class="block">You should call this method after you call
+ <a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)"><code>setSplitOrMergeEnabled(boolean, boolean, boolean, MasterSwitchType...)</code></a>
+ with skipLock be false, this method will release the lock created by above method
+ and rollback the switch state to be original state before you change switch</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#restoreSnapshot(byte[])">restoreSnapshot</a></strong>(byte[] snapshotName)</code>
<div class="block">Restore the specified snapshot on the original table.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#restoreSnapshot(byte[],%20boolean)">restoreSnapshot</a></strong>(byte[] snapshotName,
boolean takeFailSafeSnapshot)</code>
<div class="block">Restore the specified snapshot on the original table.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#restoreSnapshot(java.lang.String)">restoreSnapshot</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> snapshotName)</code>
<div class="block">Restore the specified snapshot on the original table.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#restoreSnapshot(java.lang.String,%20boolean)">restoreSnapshot</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> snapshotName,
boolean takeFailSafeSnapshot)</code>
<div class="block">Restore the specified snapshot on the original table.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Future.html?is-external=true" title="class or interface in java.util.concurrent">Future</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Void.html?is-external=true" title="class or interface in java.lang">Void</a>></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#restoreSnapshotAsync(java.lang.String)">restoreSnapshotAsync</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> snapshotName)</code>
<div class="block">Restore the specified snapshot on the original table.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#rollWALWriter(org.apache.hadoop.hbase.ServerName)">rollWALWriter</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</code>
<div class="block">Roll the log writer.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>int</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#runCatalogScan()">runCatalogScan</a></strong>()</code>
<div class="block">Ask for a scan of the catalog table</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#setBalancerRunning(boolean,%20boolean)">setBalancerRunning</a></strong>(boolean on,
boolean synchronous)</code>
<div class="block">Turn the load balancer on or off.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#setNormalizerRunning(boolean)">setNormalizerRunning</a></strong>(boolean on)</code>
<div class="block">Turn region normalizer on or off.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#setQuota(org.apache.hadoop.hbase.quotas.QuotaSettings)">setQuota</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaSettings.html" title="class in org.apache.hadoop.hbase.quotas">QuotaSettings</a> quota)</code>
<div class="block">Apply the new quota settings.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean[]</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">setSplitOrMergeEnabled</a></strong>(boolean enabled,
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">setSplitOrMergeEnabled</a></strong>(boolean enabled,
boolean synchronous,
+ boolean skipLock,
<a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>... switchTypes)</code>
<div class="block">Turn the Split or Merge switches on or off.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#shutdown()">shutdown</a></strong>()</code>
<div class="block">Shuts down the HBase cluster</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#snapshot(byte[],%20org.apache.hadoop.hbase.TableName)">snapshot</a></strong>(byte[] snapshotName,
<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code>
<div class="block">Create a timestamp consistent snapshot for the given table.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#snapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription)">snapshot</a></strong>(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot)</code>
<div class="block">Take a snapshot and wait for the server to complete that snapshot (blocking).</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#snapshot(java.lang.String,%20org.apache.hadoop.hbase.TableName)">snapshot</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> snapshotName,
<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code>
<div class="block">Take a snapshot for the given table.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#snapshot(java.lang.String,%20org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type)">snapshot</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> snapshotName,
<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
@@ -1062,84 +1072,84 @@ extends org.apache.hadoop.hbase.Abortable, <a href="http://docs.oracle.com/javas
<div class="block">Create typed snapshot of the table.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#split(org.apache.hadoop.hbase.TableName)">split</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code>
<div class="block">Split a table.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#split(org.apache.hadoop.hbase.TableName,%20byte[])">split</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
byte[] splitPoint)</code>
<div class="block">Split a table.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#splitRegion(byte[])">splitRegion</a></strong>(byte[] regionName)</code>
<div class="block">Split an individual region.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#splitRegion(byte[],%20byte[])">splitRegion</a></strong>(byte[] regionName,
byte[] splitPoint)</code>
<div class="block">Split an individual region.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#stopMaster()">stopMaster</a></strong>()</code>
<div class="block">Shuts down the current HBase master only.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#stopRegionServer(java.lang.String)">stopRegionServer</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostnamePort)</code>
<div class="block">Stop the designated regionserver</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#tableExists(org.apache.hadoop.hbase.TableName)">tableExists</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponse</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#takeSnapshotAsync(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription)">takeSnapshotAsync</a></strong>(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot)</code>
<div class="block">Take a snapshot without waiting for the server to complete that snapshot (asynchronous) Only a
single snapshot should be taken at a time, or results may be undefined.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#truncateTable(org.apache.hadoop.hbase.TableName,%20boolean)">truncateTable</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
boolean preserveSplits)</code>
<div class="block">Truncate a table.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Future.html?is-external=true" title="class or interface in java.util.concurrent">Future</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Void.html?is-external=true" title="class or interface in java.lang">Void</a>></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#truncateTableAsync(org.apache.hadoop.hbase.TableName,%20boolean)">truncateTableAsync</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
boolean preserveSplits)</code>
<div class="block">Truncate the table but does not block and wait for it be completely enabled.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#unassign(byte[],%20boolean)">unassign</a></strong>(byte[] regionName,
boolean force)</code>
<div class="block">Unassign a region from current hosting regionserver.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#updateConfiguration()">updateConfiguration</a></strong>()</code>
<div class="block">Update the configuration and trigger an online config change
on all the regionservers</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#updateConfiguration(org.apache.hadoop.hbase.ServerName)">updateConfiguration</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> server)</code>
<div class="block">Update the configuration and trigger an online config change
@@ -3702,18 +3712,22 @@ void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang">UnsupportedOperationException</a></code></dd></dl>
</li>
</ul>
-<a name="setSplitOrMergeEnabled(boolean, boolean, org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">
+<a name="setSplitOrMergeEnabled(boolean, boolean, boolean, org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>setSplitOrMergeEnabled</h4>
-<pre>boolean[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1722">setSplitOrMergeEnabled</a>(boolean enabled,
+<pre>boolean[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1726">setSplitOrMergeEnabled</a>(boolean enabled,
boolean synchronous,
+ boolean skipLock,
<a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>... switchTypes)
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">Turn the Split or Merge switches on or off.</div>
-<dl><dt><span class="strong">Parameters:</span></dt><dd><code>enabled</code> - enabled or not</dd><dd><code>synchronous</code> - If true, it waits until current split() call, if outstanding, to return.</dd><dd><code>switchTypes</code> - switchType list <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><code>Admin.MasterSwitchType</code></a></dd>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>enabled</code> - enabled or not</dd><dd><code>synchronous</code> - If true, it waits until current split() call, if outstanding, to return.</dd><dd><code>skipLock</code> - if false, we will do lock before change switch.
+ with the lock, other requests to change the switch will be rejected!
+ And when you set it to be false,
+ you should call <a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#releaseSplitOrMergeLockAndRollback()"><code>releaseSplitOrMergeLockAndRollback()</code></a> by yourself</dd><dd><code>switchTypes</code> - switchType list <a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><code>Admin.MasterSwitchType</code></a></dd>
<dt><span class="strong">Returns:</span></dt><dd>Previous switch value array</dd>
<dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
@@ -3722,10 +3736,10 @@ void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.
<a name="isSplitOrMergeEnabled(org.apache.hadoop.hbase.client.Admin.MasterSwitchType)">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>isSplitOrMergeEnabled</h4>
-<pre>boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1730">isSplitOrMergeEnabled</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a> switchType)
+<pre>boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1735">isSplitOrMergeEnabled</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a> switchType)
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">Query the current state of the switch</div>
<dl><dt><span class="strong">Returns:</span></dt><dd>true if the switch is enabled, false otherwise.</dd>
@@ -3733,6 +3747,22 @@ void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
</li>
</ul>
+<a name="releaseSplitOrMergeLockAndRollback()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>releaseSplitOrMergeLockAndRollback</h4>
+<pre>void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Admin.html#line.1743">releaseSplitOrMergeLockAndRollback</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">You should call this method after you call
+ <a href="../../../../../org/apache/hadoop/hbase/client/Admin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)"><code>setSplitOrMergeEnabled(boolean, boolean, boolean, MasterSwitchType...)</code></a>
+ with skipLock be false, this method will release the lock created by above method
+ and rollback the switch state to be original state before you change switch</div>
+<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>
+</li>
+</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/Consistency.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/Consistency.html b/apidocs/org/apache/hadoop/hbase/client/Consistency.html
index 31c7ce9..51e96d7 100644
--- a/apidocs/org/apache/hadoop/hbase/client/Consistency.html
+++ b/apidocs/org/apache/hadoop/hbase/client/Consistency.html
@@ -240,7 +240,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>values</h4>
-<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client">Consistency</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Consistency.html#line.42">values</a>()</pre>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client">Consistency</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Consistency.html#line.40">values</a>()</pre>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared. This method may be used to iterate
over the constants as follows:
@@ -257,7 +257,7 @@ for (Consistency c : Consistency.values())
<ul class="blockListLast">
<li class="blockList">
<h4>valueOf</h4>
-<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client">Consistency</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Consistency.html#line.42">valueOf</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> name)</pre>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client">Consistency</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Consistency.html#line.40">valueOf</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> name)</pre>
<div class="block">Returns the enum constant of this type with the specified name.
The string must match <i>exactly</i> an identifier used to declare an
enum constant in this type. (Extraneous whitespace characters are
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/Durability.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/Durability.html b/apidocs/org/apache/hadoop/hbase/client/Durability.html
index 55c5659..5c3c3ea 100644
--- a/apidocs/org/apache/hadoop/hbase/client/Durability.html
+++ b/apidocs/org/apache/hadoop/hbase/client/Durability.html
@@ -280,7 +280,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>values</h4>
-<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Durability.html#line.59">values</a>()</pre>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Durability.html#line.9">values</a>()</pre>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared. This method may be used to iterate
over the constants as follows:
@@ -297,7 +297,7 @@ for (Durability c : Durability.values())
<ul class="blockListLast">
<li class="blockList">
<h4>valueOf</h4>
-<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Durability.html#line.59">valueOf</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> name)</pre>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/Durability.html#line.9">valueOf</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> name)</pre>
<div class="block">Returns the enum constant of this type with the specified name.
The string must match <i>exactly</i> an identifier used to declare an
enum constant in this type. (Extraneous whitespace characters are
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/IsolationLevel.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/IsolationLevel.html b/apidocs/org/apache/hadoop/hbase/client/IsolationLevel.html
index f3bb248..927480e 100644
--- a/apidocs/org/apache/hadoop/hbase/client/IsolationLevel.html
+++ b/apidocs/org/apache/hadoop/hbase/client/IsolationLevel.html
@@ -243,7 +243,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>values</h4>
-<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client">IsolationLevel</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/IsolationLevel.html#line.49">values</a>()</pre>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client">IsolationLevel</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/client/IsolationLevel.html#line.59">values</a>()</pre>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared. This method may be used to iterate
over the constants as follows:
@@ -260,7 +260,7 @@ for (IsolationLevel c : IsolationLevel.values())
<ul class="blockList">
<li class="blockList">
<h4>valueOf</h4>
-<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client">IsolationLevel</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/IsolationLevel.html#line.49">valueOf</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> name)</pre>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client">IsolationLevel</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/IsolationLevel.html#line.59">valueOf</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> name)</pre>
<div class="block">Returns the enum constant of this type with the specified name.
The string must match <i>exactly</i> an identifier used to declare an
enum constant in this type. (Extraneous whitespace characters are
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html
index 0be00df..128982a 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Admin.MasterSwitchType.html
@@ -126,8 +126,9 @@ the order they are declared.</div>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>boolean[]</code></td>
-<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">setSplitOrMergeEnabled</a></strong>(boolean enabled,
+<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#setSplitOrMergeEnabled(boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.client.Admin.MasterSwitchType...)">setSplitOrMergeEnabled</a></strong>(boolean enabled,
boolean synchronous,
+ boolean skipLock,
<a href="../../../../../../org/apache/hadoop/hbase/client/Admin.MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client">Admin.MasterSwitchType</a>... switchTypes)</code>
<div class="block">Turn the Split or Merge switches on or off.</div>
</td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/Consistency.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Consistency.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Consistency.html
index b816f04..c093366 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Consistency.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Consistency.html
@@ -138,19 +138,19 @@ the order they are declared.</div>
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Query.html" title="class in org.apache.hadoop.hbase.client">Query</a></code></td>
+<td class="colLast"><span class="strong">Query.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Query.html#setConsistency(org.apache.hadoop.hbase.client.Consistency)">setConsistency</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client">Consistency</a> consistency)</code>
+<div class="block">Sets the consistency level for this operation</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a></code></td>
<td class="colLast"><span class="strong">Scan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html#setConsistency(org.apache.hadoop.hbase.client.Consistency)">setConsistency</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client">Consistency</a> consistency)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Get.html" title="class in org.apache.hadoop.hbase.client">Get</a></code></td>
<td class="colLast"><span class="strong">Get.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Get.html#setConsistency(org.apache.hadoop.hbase.client.Consistency)">setConsistency</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client">Consistency</a> consistency)</code> </td>
</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Query.html" title="class in org.apache.hadoop.hbase.client">Query</a></code></td>
-<td class="colLast"><span class="strong">Query.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Query.html#setConsistency(org.apache.hadoop.hbase.client.Consistency)">setConsistency</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client">Consistency</a> consistency)</code>
-<div class="block">Sets the consistency level for this operation</div>
-</td>
-</tr>
</tbody>
</table>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/Durability.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Durability.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Durability.html
index 6ff7a5c..b6e84d6 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Durability.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Durability.html
@@ -191,27 +191,27 @@ the order they are declared.</div>
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Append.html" title="class in org.apache.hadoop.hbase.client">Append</a></code></td>
-<td class="colLast"><span class="strong">Append.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Append.html#setDurability(org.apache.hadoop.hbase.client.Durability)">setDurability</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> d)</code> </td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Increment.html" title="class in org.apache.hadoop.hbase.client">Increment</a></code></td>
<td class="colLast"><span class="strong">Increment.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Increment.html#setDurability(org.apache.hadoop.hbase.client.Durability)">setDurability</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> d)</code> </td>
</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a></code></td>
-<td class="colLast"><span class="strong">Put.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Put.html#setDurability(org.apache.hadoop.hbase.client.Durability)">setDurability</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> d)</code> </td>
-</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Delete.html" title="class in org.apache.hadoop.hbase.client">Delete</a></code></td>
<td class="colLast"><span class="strong">Delete.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Delete.html#setDurability(org.apache.hadoop.hbase.client.Durability)">setDurability</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> d)</code> </td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a></code></td>
+<td class="colLast"><span class="strong">Put.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Put.html#setDurability(org.apache.hadoop.hbase.client.Durability)">setDurability</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> d)</code> </td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a></code></td>
<td class="colLast"><span class="strong">Mutation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html#setDurability(org.apache.hadoop.hbase.client.Durability)">setDurability</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> d)</code>
<div class="block">Set the durability for this mutation</div>
</td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Append.html" title="class in org.apache.hadoop.hbase.client">Append</a></code></td>
+<td class="colLast"><span class="strong">Append.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Append.html#setDurability(org.apache.hadoop.hbase.client.Durability)">setDurability</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a> d)</code> </td>
+</tr>
</tbody>
</table>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/IsolationLevel.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/IsolationLevel.html b/apidocs/org/apache/hadoop/hbase/client/class-use/IsolationLevel.html
index df9ed0a..db5fc52 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/IsolationLevel.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/IsolationLevel.html
@@ -131,19 +131,19 @@ the order they are declared.</div>
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Query.html" title="class in org.apache.hadoop.hbase.client">Query</a></code></td>
+<td class="colLast"><span class="strong">Query.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Query.html#setIsolationLevel(org.apache.hadoop.hbase.client.IsolationLevel)">setIsolationLevel</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client">IsolationLevel</a> level)</code>
+<div class="block">Set the isolation level for this query.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a></code></td>
<td class="colLast"><span class="strong">Scan.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html#setIsolationLevel(org.apache.hadoop.hbase.client.IsolationLevel)">setIsolationLevel</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client">IsolationLevel</a> level)</code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Get.html" title="class in org.apache.hadoop.hbase.client">Get</a></code></td>
<td class="colLast"><span class="strong">Get.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Get.html#setIsolationLevel(org.apache.hadoop.hbase.client.IsolationLevel)">setIsolationLevel</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client">IsolationLevel</a> level)</code> </td>
</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Query.html" title="class in org.apache.hadoop.hbase.client">Query</a></code></td>
-<td class="colLast"><span class="strong">Query.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Query.html#setIsolationLevel(org.apache.hadoop.hbase.client.IsolationLevel)">setIsolationLevel</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client">IsolationLevel</a> level)</code>
-<div class="block">Set the isolation level for this query.</div>
-</td>
-</tr>
</tbody>
</table>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html
index c0ca016..f176d84 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Mutation.html
@@ -237,15 +237,15 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tbody>
<tr class="altColor">
+<td class="colFirst"><code>org.apache.hadoop.mapreduce.RecordWriter<<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>></code></td>
+<td class="colLast"><span class="strong">MultiTableOutputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html#getRecordWriter(org.apache.hadoop.mapreduce.TaskAttemptContext)">getRecordWriter</a></strong>(org.apache.hadoop.mapreduce.TaskAttemptContext context)</code> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>org.apache.hadoop.mapreduce.RecordWriter<<a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html" title="type parameter in TableOutputFormat">KEY</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>></code></td>
<td class="colLast"><span class="strong">TableOutputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html#getRecordWriter(org.apache.hadoop.mapreduce.TaskAttemptContext)">getRecordWriter</a></strong>(org.apache.hadoop.mapreduce.TaskAttemptContext context)</code>
<div class="block">Creates a new record writer.</div>
</td>
</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>org.apache.hadoop.mapreduce.RecordWriter<<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>></code></td>
-<td class="colLast"><span class="strong">MultiTableOutputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html#getRecordWriter(org.apache.hadoop.mapreduce.TaskAttemptContext)">getRecordWriter</a></strong>(org.apache.hadoop.mapreduce.TaskAttemptContext context)</code> </td>
-</tr>
</tbody>
</table>
<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/Result.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Result.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Result.html
index e93515b..b29059e 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Result.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Result.html
@@ -273,11 +273,11 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<tbody>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a></code></td>
-<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReader.html#createValue()">createValue</a></strong>()</code> </td>
+<td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.html#createValue()">createValue</a></strong>()</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a></code></td>
-<td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.html#createValue()">createValue</a></strong>()</code> </td>
+<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReader.html#createValue()">createValue</a></strong>()</code> </td>
</tr>
</tbody>
</table>
@@ -290,23 +290,23 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<tbody>
<tr class="altColor">
<td class="colFirst"><code>org.apache.hadoop.mapred.RecordReader<<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>></code></td>
-<td class="colLast"><span class="strong">TableSnapshotInputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableSnapshotInputFormat.html#getRecordReader(org.apache.hadoop.mapred.InputSplit,%20org.apache.hadoop.mapred.JobConf,%20org.apache.hadoop.mapred.Reporter)">getRecordReader</a></strong>(org.apache.hadoop.mapred.InputSplit split,
+<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableInputFormatBase.html#getRecordReader(org.apache.hadoop.mapred.InputSplit,%20org.apache.hadoop.mapred.JobConf,%20org.apache.hadoop.mapred.Reporter)">getRecordReader</a></strong>(org.apache.hadoop.mapred.InputSplit split,
org.apache.hadoop.mapred.JobConf job,
- org.apache.hadoop.mapred.Reporter reporter)</code> </td>
+ org.apache.hadoop.mapred.Reporter reporter)</code>
+<div class="block">Builds a TableRecordReader.</div>
+</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>org.apache.hadoop.mapred.RecordReader<<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>></code></td>
-<td class="colLast"><span class="strong">MultiTableSnapshotInputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/MultiTableSnapshotInputFormat.html#getRecordReader(org.apache.hadoop.mapred.InputSplit,%20org.apache.hadoop.mapred.JobConf,%20org.apache.hadoop.mapred.Reporter)">getRecordReader</a></strong>(org.apache.hadoop.mapred.InputSplit split,
+<td class="colLast"><span class="strong">TableSnapshotInputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableSnapshotInputFormat.html#getRecordReader(org.apache.hadoop.mapred.InputSplit,%20org.apache.hadoop.mapred.JobConf,%20org.apache.hadoop.mapred.Reporter)">getRecordReader</a></strong>(org.apache.hadoop.mapred.InputSplit split,
org.apache.hadoop.mapred.JobConf job,
org.apache.hadoop.mapred.Reporter reporter)</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>org.apache.hadoop.mapred.RecordReader<<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>></code></td>
-<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableInputFormatBase.html#getRecordReader(org.apache.hadoop.mapred.InputSplit,%20org.apache.hadoop.mapred.JobConf,%20org.apache.hadoop.mapred.Reporter)">getRecordReader</a></strong>(org.apache.hadoop.mapred.InputSplit split,
+<td class="colLast"><span class="strong">MultiTableSnapshotInputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/MultiTableSnapshotInputFormat.html#getRecordReader(org.apache.hadoop.mapred.InputSplit,%20org.apache.hadoop.mapred.JobConf,%20org.apache.hadoop.mapred.Reporter)">getRecordReader</a></strong>(org.apache.hadoop.mapred.InputSplit split,
org.apache.hadoop.mapred.JobConf job,
- org.apache.hadoop.mapred.Reporter reporter)</code>
-<div class="block">Builds a TableRecordReader.</div>
-</td>
+ org.apache.hadoop.mapred.Reporter reporter)</code> </td>
</tr>
</tbody>
</table>
@@ -343,12 +343,12 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReader.html#next(org.apache.hadoop.hbase.io.ImmutableBytesWritable,%20org.apache.hadoop.hbase.client.Result)">next</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a> key,
+<td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.html#next(org.apache.hadoop.hbase.io.ImmutableBytesWritable,%20org.apache.hadoop.hbase.client.Result)">next</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a> key,
<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> value)</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.html#next(org.apache.hadoop.hbase.io.ImmutableBytesWritable,%20org.apache.hadoop.hbase.client.Result)">next</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a> key,
+<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReader.html#next(org.apache.hadoop.hbase.io.ImmutableBytesWritable,%20org.apache.hadoop.hbase.client.Result)">next</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a> key,
<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> value)</code> </td>
</tr>
</tbody>
@@ -394,13 +394,13 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<tbody>
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a></code></td>
-<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html#getCurrentValue()">getCurrentValue</a></strong>()</code>
+<td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html#getCurrentValue()">getCurrentValue</a></strong>()</code>
<div class="block">Returns the current value.</div>
</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a></code></td>
-<td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html#getCurrentValue()">getCurrentValue</a></strong>()</code>
+<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html#getCurrentValue()">getCurrentValue</a></strong>()</code>
<div class="block">Returns the current value.</div>
</td>
</tr>
@@ -415,8 +415,10 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<tbody>
<tr class="altColor">
<td class="colFirst"><code>org.apache.hadoop.mapreduce.RecordReader<<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>></code></td>
-<td class="colLast"><span class="strong">TableSnapshotInputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.html#createRecordReader(org.apache.hadoop.mapreduce.InputSplit,%20org.apache.hadoop.mapreduce.TaskAttemptContext)">createRecordReader</a></strong>(org.apache.hadoop.mapreduce.InputSplit split,
- org.apache.hadoop.mapreduce.TaskAttemptContext context)</code> </td>
+<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#createRecordReader(org.apache.hadoop.mapreduce.InputSplit,%20org.apache.hadoop.mapreduce.TaskAttemptContext)">createRecordReader</a></strong>(org.apache.hadoop.mapreduce.InputSplit split,
+ org.apache.hadoop.mapreduce.TaskAttemptContext context)</code>
+<div class="block">Builds a <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce"><code>TableRecordReader</code></a>.</div>
+</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>org.apache.hadoop.mapreduce.RecordReader<<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>></code></td>
@@ -427,10 +429,8 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="altColor">
<td class="colFirst"><code>org.apache.hadoop.mapreduce.RecordReader<<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a>,<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>></code></td>
-<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#createRecordReader(org.apache.hadoop.mapreduce.InputSplit,%20org.apache.hadoop.mapreduce.TaskAttemptContext)">createRecordReader</a></strong>(org.apache.hadoop.mapreduce.InputSplit split,
- org.apache.hadoop.mapreduce.TaskAttemptContext context)</code>
-<div class="block">Builds a <a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html" title="class in org.apache.hadoop.hbase.mapreduce"><code>TableRecordReader</code></a>.</div>
-</td>
+<td class="colLast"><span class="strong">TableSnapshotInputFormat.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.html#createRecordReader(org.apache.hadoop.mapreduce.InputSplit,%20org.apache.hadoop.mapreduce.TaskAttemptContext)">createRecordReader</a></strong>(org.apache.hadoop.mapreduce.InputSplit split,
+ org.apache.hadoop.mapreduce.TaskAttemptContext context)</code> </td>
</tr>
</tbody>
</table>
@@ -449,18 +449,18 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">IdentityTableMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/IdentityTableMapper.html#map(org.apache.hadoop.hbase.io.ImmutableBytesWritable,%20org.apache.hadoop.hbase.client.Result,%20org.apache.hadoop.mapreduce.Mapper.Context)">map</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a> key,
+<td class="colLast"><span class="strong">GroupingTableMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/GroupingTableMapper.html#map(org.apache.hadoop.hbase.io.ImmutableBytesWritable,%20org.apache.hadoop.hbase.client.Result,%20org.apache.hadoop.mapreduce.Mapper.Context)">map</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a> key,
<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> value,
org.apache.hadoop.mapreduce.Mapper.Context context)</code>
-<div class="block">Pass the key, value to reduce.</div>
+<div class="block">Extract the grouping columns from value to construct a new key.</div>
</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">GroupingTableMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/GroupingTableMapper.html#map(org.apache.hadoop.hbase.io.ImmutableBytesWritable,%20org.apache.hadoop.hbase.client.Result,%20org.apache.hadoop.mapreduce.Mapper.Context)">map</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a> key,
+<td class="colLast"><span class="strong">IdentityTableMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/IdentityTableMapper.html#map(org.apache.hadoop.hbase.io.ImmutableBytesWritable,%20org.apache.hadoop.hbase.client.Result,%20org.apache.hadoop.mapreduce.Mapper.Context)">map</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html" title="class in org.apache.hadoop.hbase.io">ImmutableBytesWritable</a> key,
<a href="../../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> value,
org.apache.hadoop.mapreduce.Mapper.Context context)</code>
-<div class="block">Extract the grouping columns from value to construct a new key.</div>
+<div class="block">Pass the key, value to reduce.</div>
</td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/Row.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Row.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Row.html
index a703345..f7d7f5a 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Row.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Row.html
@@ -168,7 +168,7 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>int</code></td>
-<td class="colLast"><span class="strong">RowMutations.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/RowMutations.html#compareTo(org.apache.hadoop.hbase.client.Row)">compareTo</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface in org.apache.hadoop.hbase.client">Row</a> i)</code> </td>
+<td class="colLast"><span class="strong">Mutation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html#compareTo(org.apache.hadoop.hbase.client.Row)">compareTo</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface in org.apache.hadoop.hbase.client">Row</a> d)</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>int</code></td>
@@ -176,7 +176,7 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>int</code></td>
-<td class="colLast"><span class="strong">Mutation.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Mutation.html#compareTo(org.apache.hadoop.hbase.client.Row)">compareTo</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface in org.apache.hadoop.hbase.client">Row</a> d)</code> </td>
+<td class="colLast"><span class="strong">RowMutations.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/RowMutations.html#compareTo(org.apache.hadoop.hbase.client.Row)">compareTo</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Row.html" title="interface in org.apache.hadoop.hbase.client">Row</a> i)</code> </td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
index 0cc3fc2..1abb5f7 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
@@ -582,7 +582,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html#setScan(org.apache.hadoop.hbase.client.Scan)">setScan</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code>
+<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#setScan(org.apache.hadoop.hbase.client.Scan)">setScan</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code>
<div class="block">Sets the scan defining the actual details like columns etc.</div>
</td>
</tr>
@@ -594,7 +594,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#setScan(org.apache.hadoop.hbase.client.Scan)">setScan</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code>
+<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html#setScan(org.apache.hadoop.hbase.client.Scan)">setScan</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code>
<div class="block">Sets the scan defining the actual details like columns etc.</div>
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9f9a078f/apidocs/org/apache/hadoop/hbase/client/class-use/Table.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Table.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Table.html
index e4b73ae..3ad86c2 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Table.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Table.html
@@ -158,11 +158,11 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<tbody>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReader.html#setHTable(org.apache.hadoop.hbase.client.Table)">setHTable</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a> htable)</code> </td>
+<td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.html#setHTable(org.apache.hadoop.hbase.client.Table)">setHTable</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a> htable)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.html#setHTable(org.apache.hadoop.hbase.client.Table)">setHTable</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a> htable)</code> </td>
+<td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapred/TableRecordReader.html#setHTable(org.apache.hadoop.hbase.client.Table)">setHTable</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a> htable)</code> </td>
</tr>
</tbody>
</table>