You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2015/12/11 17:31:06 UTC
[14/51] [partial] hbase-site git commit: Published site at
22b95aebcd7fc742412ab514520008fda5e327de.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 99f7e3f..d36d81b 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -599,23 +599,23 @@
<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.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.FlushResult.Result</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionMergeTransaction.RegionMergeTransactionPhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanQueryMatcher.MatchCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">FlushType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.SplitTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">SplitTransaction.SplitTransactionPhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.LimitScope</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">StoreScanner.StoreScannerCompactionRace</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DefaultHeapMemoryTuner.StepDirection</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DeleteTracker.DeleteCompare.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DeleteTracker.DeleteCompare</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DeleteTracker.DeleteResult</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionOpeningState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionOpeningState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.LimitScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.FlushResult.Result</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">SplitLogWorker.TaskExecutor.Status</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">FlushType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.SplitTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">SplitTransaction.SplitTransactionPhase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionMergeTransaction.RegionMergeTransactionPhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">StoreScanner.StoreScannerCompactionRace</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.NextState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanQueryMatcher.MatchCode</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/devapidocs/org/apache/hadoop/hbase/security/EncryptionUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/EncryptionUtil.html b/devapidocs/org/apache/hadoop/hbase/security/EncryptionUtil.html
index 8bb7720..1626aed 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/EncryptionUtil.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/EncryptionUtil.html
@@ -97,7 +97,7 @@
<br>
<pre><a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html" title="annotation in org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Evolving.html" title="annotation in org.apache.hadoop.hbase.classification">@InterfaceStability.Evolving</a>
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.44">EncryptionUtil</a>
+public final class <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.47">EncryptionUtil</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">Some static utility methods for encryption uses in hbase-client.</div>
</li>
@@ -119,6 +119,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<th class="colLast" scope="col">Field and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>private static org.apache.commons.logging.Log</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#LOG">LOG</a></strong></code> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/SecureRandom.html?is-external=true" title="class or interface in java.security">SecureRandom</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#RNG">RNG</a></strong></code> </td>
</tr>
@@ -134,10 +138,14 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier</th>
+<th class="colLast" scope="col">Constructor and Description</th>
</tr>
<tr class="altColor">
-<td class="colOne"><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#EncryptionUtil()">EncryptionUtil</a></strong>()</code> </td>
+<td class="colFirst"><code>private </code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#EncryptionUtil()">EncryptionUtil</a></strong>()</code>
+<div class="block">Private constructor to keep this class from being instantiated.</div>
+</td>
</tr>
</table>
</li>
@@ -155,12 +163,28 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<th class="colLast" scope="col">Method and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/io/crypto/Encryption.Context.html" title="class in org.apache.hadoop.hbase.io.crypto">Encryption.Context</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#createEncryptionContext(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.HColumnDescriptor)">createEncryptionContext</a></strong>(org.apache.hadoop.conf.Configuration conf,
+ <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html" title="class in org.apache.hadoop.hbase">HColumnDescriptor</a> family)</code>
+<div class="block">Helper to create an encyption context.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#getUnwrapKey(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKey,%20org.apache.hadoop.hbase.io.crypto.Cipher)">getUnwrapKey</a></strong>(org.apache.hadoop.conf.Configuration conf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subject,
org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKey wrappedKey,
<a href="../../../../../org/apache/hadoop/hbase/io/crypto/Cipher.html" title="class in org.apache.hadoop.hbase.io.crypto">Cipher</a> cipher)</code> </td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#unwrapKey(org.apache.hadoop.conf.Configuration,%20byte[])">unwrapKey</a></strong>(org.apache.hadoop.conf.Configuration conf,
+ byte[] keyBytes)</code>
+<div class="block">Helper for <a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#unwrapKey(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20byte[])"><code>unwrapKey(Configuration, String, byte[])</code></a> which automatically uses the
+ configured master and alternative keys, rather than having to specify a key type to unwrap
+ with.</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#unwrapKey(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20byte[])">unwrapKey</a></strong>(org.apache.hadoop.conf.Configuration conf,
@@ -215,13 +239,22 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<!-- -->
</a>
<h3>Field Detail</h3>
+<a name="LOG">
+<!-- -->
+</a>
+<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/security/EncryptionUtil.html#line.48">LOG</a></pre>
+</li>
+</ul>
<a name="RNG">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>RNG</h4>
-<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/security/SecureRandom.html?is-external=true" title="class or interface in java.security">SecureRandom</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.46">RNG</a></pre>
+<pre>private static final <a href="http://docs.oracle.com/javase/7/docs/api/java/security/SecureRandom.html?is-external=true" title="class or interface in java.security">SecureRandom</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.50">RNG</a></pre>
</li>
</ul>
</li>
@@ -238,7 +271,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>EncryptionUtil</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.44">EncryptionUtil</a>()</pre>
+<pre>private <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.55">EncryptionUtil</a>()</pre>
+<div class="block">Private constructor to keep this class from being instantiated.</div>
</li>
</ul>
</li>
@@ -255,7 +289,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>wrapKey</h4>
-<pre>public static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.57">wrapKey</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.67">wrapKey</a>(org.apache.hadoop.conf.Configuration conf,
byte[] key,
<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> algorithm)
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>
@@ -273,7 +307,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>wrapKey</h4>
-<pre>public static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.72">wrapKey</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.82">wrapKey</a>(org.apache.hadoop.conf.Configuration conf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subject,
<a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a> key)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -291,7 +325,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>unwrapKey</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.112">unwrapKey</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.122">unwrapKey</a>(org.apache.hadoop.conf.Configuration conf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subject,
byte[] value)
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>,
@@ -311,7 +345,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getUnwrapKey</h4>
-<pre>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.125">getUnwrapKey</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.135">getUnwrapKey</a>(org.apache.hadoop.conf.Configuration conf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subject,
org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKey wrappedKey,
<a href="../../../../../org/apache/hadoop/hbase/io/crypto/Cipher.html" title="class in org.apache.hadoop.hbase.io.crypto">Cipher</a> cipher)
@@ -325,10 +359,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<a name="unwrapWALKey(org.apache.hadoop.conf.Configuration, java.lang.String, byte[])">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>unwrapWALKey</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.150">unwrapWALKey</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.160">unwrapWALKey</a>(org.apache.hadoop.conf.Configuration conf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subject,
byte[] value)
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>,
@@ -342,6 +376,42 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/security/KeyException.html?is-external=true" title="class or interface in java.security">KeyException</a></code> - if fail to unwrap the key</dd></dl>
</li>
</ul>
+<a name="createEncryptionContext(org.apache.hadoop.conf.Configuration, org.apache.hadoop.hbase.HColumnDescriptor)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createEncryptionContext</h4>
+<pre>public static <a href="../../../../../org/apache/hadoop/hbase/io/crypto/Encryption.Context.html" title="class in org.apache.hadoop.hbase.io.crypto">Encryption.Context</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.180">createEncryptionContext</a>(org.apache.hadoop.conf.Configuration conf,
+ <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html" title="class in org.apache.hadoop.hbase">HColumnDescriptor</a> family)
+ 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">Helper to create an encyption context.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>conf</code> - The current configuration.</dd><dd><code>family</code> - The current column descriptor.</dd>
+<dt><span class="strong">Returns:</span></dt><dd>The created encryption context.</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - if an encryption key for the column cannot be unwrapped</dd></dl>
+</li>
+</ul>
+<a name="unwrapKey(org.apache.hadoop.conf.Configuration, byte[])">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>unwrapKey</h4>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/security/Key.html?is-external=true" title="class or interface in java.security">Key</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/security/EncryptionUtil.html#line.231">unwrapKey</a>(org.apache.hadoop.conf.Configuration conf,
+ byte[] keyBytes)
+ 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">Helper for <a href="../../../../../org/apache/hadoop/hbase/security/EncryptionUtil.html#unwrapKey(org.apache.hadoop.conf.Configuration,%20java.lang.String,%20byte[])"><code>unwrapKey(Configuration, String, byte[])</code></a> which automatically uses the
+ configured master and alternative keys, rather than having to specify a key type to unwrap
+ with.
+
+ The configuration must be set up correctly for key alias resolution.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>conf</code> - the current configuration</dd><dd><code>keyBytes</code> - the key encrypted by master (or alternative) to unwrap</dd>
+<dt><span class="strong">Returns:</span></dt><dd>the key bytes, decrypted</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - if the key cannot be unwrapped</dd></dl>
+</li>
+</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index 3311a2e..509bca2 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -152,9 +152,9 @@
<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.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslUtil.QualityOfProtection</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">AuthMethod</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">AuthMethod</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslUtil.QualityOfProtection</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/HBaseSnapshotException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/HBaseSnapshotException.html b/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/HBaseSnapshotException.html
index dc9c513..2504cc4 100644
--- a/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/HBaseSnapshotException.html
+++ b/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/HBaseSnapshotException.html
@@ -106,9 +106,7 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#isSnapshotFinished(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription)">isSnapshotFinished</a></strong>(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot)</code>
-<div class="block">Check the current state of the passed snapshot.</div>
-</td>
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#isSnapshotFinished(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription)">isSnapshotFinished</a></strong>(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html b/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html
index 3cc63f7..d8bf021 100644
--- a/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html
+++ b/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/RestoreSnapshotException.html
@@ -98,38 +98,20 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#cloneSnapshot(byte[],%20byte[])">cloneSnapshot</a></strong>(byte[] snapshotName,
- byte[] tableName)</code>
-<div class="block">Create a new table by cloning the snapshot content.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#cloneSnapshot(byte[],%20org.apache.hadoop.hbase.TableName)">cloneSnapshot</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 new table by cloning the snapshot content.</div>
-</td>
+ <a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">Admin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/Admin.html#cloneSnapshot(byte[],%20org.apache.hadoop.hbase.TableName)">cloneSnapshot</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 new table by cloning the snapshot content.</div>
</td>
</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#cloneSnapshot(java.lang.String,%20java.lang.String)">cloneSnapshot</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="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> tableName)</code>
-<div class="block">Create a new table by cloning the snapshot content.</div>
-</td>
-</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#cloneSnapshot(java.lang.String,%20org.apache.hadoop.hbase.TableName)">cloneSnapshot</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">Create a new table by cloning the snapshot content.</div>
-</td>
+ <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>void</code></td>
@@ -153,9 +135,7 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#restoreSnapshot(byte[])">restoreSnapshot</a></strong>(byte[] snapshotName)</code>
-<div class="block">Restore the specified snapshot on the original table.</div>
-</td>
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#restoreSnapshot(byte[])">restoreSnapshot</a></strong>(byte[] snapshotName)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
@@ -166,9 +146,7 @@
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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>
+ boolean takeFailSafeSnapshot)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
@@ -179,9 +157,7 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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>
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
@@ -192,9 +168,7 @@
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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>
+ boolean takeFailSafeSnapshot)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/SnapshotCreationException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/SnapshotCreationException.html b/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/SnapshotCreationException.html
index 0d9a945..632ed8c 100644
--- a/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/SnapshotCreationException.html
+++ b/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/SnapshotCreationException.html
@@ -106,38 +106,19 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#snapshot(byte[],%20byte[])">snapshot</a></strong>(byte[] snapshotName,
- byte[] tableName)</code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#snapshot(byte[],%20byte[],%20org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type)">snapshot</a></strong>(byte[] snapshotName,
- byte[] tableName,
- org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type flushType)</code>
-<div class="block">Create snapshot for the given table of given flush type.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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">public void snapshot(final String snapshotName,
- Create a timestamp consistent snapshot for the given table.</div>
-</td>
+ <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>void</code></td>
<td class="colLast"><span class="strong">Admin.</span><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">public void snapshot(final String snapshotName, Create a timestamp consistent snapshot for the
- given table.</div>
+<div class="block">Create a timestamp consistent snapshot for the given table.</div>
</td>
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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>
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#snapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription)">snapshot</a></strong>(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
@@ -147,44 +128,23 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#snapshot(java.lang.String,%20byte[],%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,
- byte[] tableName,
- org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type type)</code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#snapshot(java.lang.String,%20java.lang.String)">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="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> tableName)</code> </td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#snapshot(java.lang.String,%20java.lang.String,%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="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> tableName,
- org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type type)</code> </td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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>
+ <a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">Admin.</span><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"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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,
- org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type type)</code>
-<div class="block">Create typed snapshot of the table.</div>
-</td>
+ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type type)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><span class="strong">Admin.</span><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,
@@ -192,13 +152,11 @@
<div class="block">Create typed snapshot of the table.</div>
</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"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.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)</div>
-</td>
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#takeSnapshotAsync(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription)">takeSnapshotAsync</a></strong>(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot)</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponse</code></td>
<td class="colLast"><span class="strong">Admin.</span><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
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/UnknownSnapshotException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/UnknownSnapshotException.html b/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/UnknownSnapshotException.html
index 44b7b01..e7c7219 100644
--- a/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/UnknownSnapshotException.html
+++ b/devapidocs/org/apache/hadoop/hbase/snapshot/class-use/UnknownSnapshotException.html
@@ -98,9 +98,7 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#isSnapshotFinished(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription)">isSnapshotFinished</a></strong>(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot)</code>
-<div class="block">Check the current state of the passed snapshot.</div>
-</td>
+<td class="colLast"><span class="strong">HBaseAdmin.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.html#isSnapshotFinished(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription)">isSnapshotFinished</a></strong>(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>boolean</code></td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index ec1c250..a47a6c7 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -379,31 +379,13 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.110">m_master</a></pre>
</li>
</ul>
-<a name="m_catalogJanitorEnabled">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>m_catalogJanitorEnabled</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.122">m_catalogJanitorEnabled</a></pre>
-</li>
-</ul>
-<a name="m_catalogJanitorEnabled__IsNotDefault">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>m_catalogJanitorEnabled__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.127">m_catalogJanitorEnabled__IsNotDefault</a></pre>
-</li>
-</ul>
<a name="m_deadServers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>m_deadServers</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.139">m_deadServers</a></pre>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.122">m_deadServers</a></pre>
</li>
</ul>
<a name="m_deadServers__IsNotDefault">
@@ -412,25 +394,25 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>m_deadServers__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.144">m_deadServers__IsNotDefault</a></pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.127">m_deadServers__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_format">
+<a name="m_metaLocation">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.156">m_format</a></pre>
+<h4>m_metaLocation</h4>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.139">m_metaLocation</a></pre>
</li>
</ul>
-<a name="m_format__IsNotDefault">
+<a name="m_metaLocation__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.161">m_format__IsNotDefault</a></pre>
+<h4>m_metaLocation__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.144">m_metaLocation__IsNotDefault</a></pre>
</li>
</ul>
<a name="m_assignmentManager">
@@ -439,7 +421,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>m_assignmentManager</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.173">m_assignmentManager</a></pre>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.156">m_assignmentManager</a></pre>
</li>
</ul>
<a name="m_assignmentManager__IsNotDefault">
@@ -448,7 +430,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>m_assignmentManager__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.178">m_assignmentManager__IsNotDefault</a></pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.161">m_assignmentManager__IsNotDefault</a></pre>
</li>
</ul>
<a name="m_serverManager">
@@ -457,7 +439,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>m_serverManager</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.190">m_serverManager</a></pre>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.173">m_serverManager</a></pre>
</li>
</ul>
<a name="m_serverManager__IsNotDefault">
@@ -466,7 +448,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>m_serverManager__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.195">m_serverManager__IsNotDefault</a></pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.178">m_serverManager__IsNotDefault</a></pre>
</li>
</ul>
<a name="m_filter">
@@ -475,7 +457,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>m_filter</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.207">m_filter</a></pre>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.190">m_filter</a></pre>
</li>
</ul>
<a name="m_filter__IsNotDefault">
@@ -484,61 +466,79 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>m_filter__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.212">m_filter__IsNotDefault</a></pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.195">m_filter__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_servers">
+<a name="m_catalogJanitorEnabled">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_servers</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.224">m_servers</a></pre>
+<h4>m_catalogJanitorEnabled</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.207">m_catalogJanitorEnabled</a></pre>
</li>
</ul>
-<a name="m_servers__IsNotDefault">
+<a name="m_catalogJanitorEnabled__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_servers__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.229">m_servers__IsNotDefault</a></pre>
+<h4>m_catalogJanitorEnabled__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.212">m_catalogJanitorEnabled__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_frags">
+<a name="m_format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_frags</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.241">m_frags</a></pre>
+<h4>m_format</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.224">m_format</a></pre>
</li>
</ul>
-<a name="m_frags__IsNotDefault">
+<a name="m_format__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_frags__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.246">m_frags__IsNotDefault</a></pre>
+<h4>m_format__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.229">m_format__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_metaLocation">
+<a name="m_servers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_metaLocation</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.258">m_metaLocation</a></pre>
+<h4>m_servers</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.241">m_servers</a></pre>
</li>
</ul>
-<a name="m_metaLocation__IsNotDefault">
+<a name="m_servers__IsNotDefault">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>m_servers__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.246">m_servers__IsNotDefault</a></pre>
+</li>
+</ul>
+<a name="m_frags">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>m_frags</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.258">m_frags</a></pre>
+</li>
+</ul>
+<a name="m_frags__IsNotDefault">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>m_metaLocation__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.263">m_metaLocation__IsNotDefault</a></pre>
+<h4>m_frags__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.263">m_frags__IsNotDefault</a></pre>
</li>
</ul>
</li>
@@ -584,40 +584,13 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.106">getMaster</a>()</pre>
</li>
</ul>
-<a name="setCatalogJanitorEnabled(boolean)">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setCatalogJanitorEnabled</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.112">setCatalogJanitorEnabled</a>(boolean catalogJanitorEnabled)</pre>
-</li>
-</ul>
-<a name="getCatalogJanitorEnabled()">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getCatalogJanitorEnabled</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.118">getCatalogJanitorEnabled</a>()</pre>
-</li>
-</ul>
-<a name="getCatalogJanitorEnabled__IsNotDefault()">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getCatalogJanitorEnabled__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.123">getCatalogJanitorEnabled__IsNotDefault</a>()</pre>
-</li>
-</ul>
<a name="setDeadServers(java.util.Set)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>setDeadServers</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.129">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> deadServers)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.112">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> deadServers)</pre>
</li>
</ul>
<a name="getDeadServers()">
@@ -626,7 +599,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>getDeadServers</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.135">getDeadServers</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.118">getDeadServers</a>()</pre>
</li>
</ul>
<a name="getDeadServers__IsNotDefault()">
@@ -635,34 +608,34 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>getDeadServers__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.140">getDeadServers__IsNotDefault</a>()</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.123">getDeadServers__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
+<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFormat</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.146">setFormat</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> format)</pre>
+<h4>setMetaLocation</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.129">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> metaLocation)</pre>
</li>
</ul>
-<a name="getFormat()">
+<a name="getMetaLocation()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.152">getFormat</a>()</pre>
+<h4>getMetaLocation</h4>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.135">getMetaLocation</a>()</pre>
</li>
</ul>
-<a name="getFormat__IsNotDefault()">
+<a name="getMetaLocation__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.157">getFormat__IsNotDefault</a>()</pre>
+<h4>getMetaLocation__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.140">getMetaLocation__IsNotDefault</a>()</pre>
</li>
</ul>
<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
@@ -671,7 +644,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>setAssignmentManager</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.163">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> assignmentManager)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.146">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> assignmentManager)</pre>
</li>
</ul>
<a name="getAssignmentManager()">
@@ -680,7 +653,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>getAssignmentManager</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.169">getAssignmentManager</a>()</pre>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.152">getAssignmentManager</a>()</pre>
</li>
</ul>
<a name="getAssignmentManager__IsNotDefault()">
@@ -689,7 +662,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>getAssignmentManager__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.174">getAssignmentManager__IsNotDefault</a>()</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.157">getAssignmentManager__IsNotDefault</a>()</pre>
</li>
</ul>
<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
@@ -698,7 +671,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>setServerManager</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.180">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> serverManager)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.163">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> serverManager)</pre>
</li>
</ul>
<a name="getServerManager()">
@@ -707,7 +680,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>getServerManager</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.186">getServerManager</a>()</pre>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.169">getServerManager</a>()</pre>
</li>
</ul>
<a name="getServerManager__IsNotDefault()">
@@ -716,7 +689,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>getServerManager__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.191">getServerManager__IsNotDefault</a>()</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.174">getServerManager__IsNotDefault</a>()</pre>
</li>
</ul>
<a name="setFilter(java.lang.String)">
@@ -725,7 +698,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>setFilter</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.197">setFilter</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> filter)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.180">setFilter</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> filter)</pre>
</li>
</ul>
<a name="getFilter()">
@@ -734,7 +707,7 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>getFilter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.203">getFilter</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.186">getFilter</a>()</pre>
</li>
</ul>
<a name="getFilter__IsNotDefault()">
@@ -743,88 +716,115 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<ul class="blockList">
<li class="blockList">
<h4>getFilter__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.208">getFilter__IsNotDefault</a>()</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.191">getFilter__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setServers(java.util.List)">
+<a name="setCatalogJanitorEnabled(boolean)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServers</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.214">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> servers)</pre>
+<h4>setCatalogJanitorEnabled</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.197">setCatalogJanitorEnabled</a>(boolean catalogJanitorEnabled)</pre>
</li>
</ul>
-<a name="getServers()">
+<a name="getCatalogJanitorEnabled()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServers</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.220">getServers</a>()</pre>
+<h4>getCatalogJanitorEnabled</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.203">getCatalogJanitorEnabled</a>()</pre>
</li>
</ul>
-<a name="getServers__IsNotDefault()">
+<a name="getCatalogJanitorEnabled__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServers__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.225">getServers__IsNotDefault</a>()</pre>
+<h4>getCatalogJanitorEnabled__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.208">getCatalogJanitorEnabled__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setFrags(java.util.Map)">
+<a name="setFormat(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFrags</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.231">setFrags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> frags)</pre>
+<h4>setFormat</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.214">setFormat</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> format)</pre>
</li>
</ul>
-<a name="getFrags()">
+<a name="getFormat()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFrags</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.237">getFrags</a>()</pre>
+<h4>getFormat</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.220">getFormat</a>()</pre>
</li>
</ul>
-<a name="getFrags__IsNotDefault()">
+<a name="getFormat__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFrags__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.242">getFrags__IsNotDefault</a>()</pre>
+<h4>getFormat__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.225">getFormat__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
+<a name="setServers(java.util.List)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setMetaLocation</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.248">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> metaLocation)</pre>
+<h4>setServers</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.231">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> servers)</pre>
</li>
</ul>
-<a name="getMetaLocation()">
+<a name="getServers()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getMetaLocation</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.254">getMetaLocation</a>()</pre>
+<h4>getServers</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.237">getServers</a>()</pre>
</li>
</ul>
-<a name="getMetaLocation__IsNotDefault()">
+<a name="getServers__IsNotDefault()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getServers__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.242">getServers__IsNotDefault</a>()</pre>
+</li>
+</ul>
+<a name="setFrags(java.util.Map)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setFrags</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.248">setFrags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> frags)</pre>
+</li>
+</ul>
+<a name="getFrags()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFrags</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.254">getFrags</a>()</pre>
+</li>
+</ul>
+<a name="getFrags__IsNotDefault()">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>getMetaLocation__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.259">getMetaLocation__IsNotDefault</a>()</pre>
+<h4>getFrags__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.259">getFrags__IsNotDefault</a>()</pre>
</li>
</ul>
</li>