http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9577bd5e/devapidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index 3b14c33..8e7c360 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -2706,125 +2706,118 @@
 <td class="colLast"><code>134217728L</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.DEFAULT_NORMALIZATION_ENABLED">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;boolean</code></td>
-<td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#DEFAULT_NORMALIZATION_ENABLED">DEFAULT_NORMALIZATION_ENABLED</a></code></td>
-<td class="colLast"><code>false</code></td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.DEFAULT_READONLY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;boolean</code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#DEFAULT_READONLY">DEFAULT_READONLY</a></code></td>
 <td class="colLast"><code>false</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.DEFAULT_REGION_MEMSTORE_REPLICATION">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;boolean</code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#DEFAULT_REGION_MEMSTORE_REPLICATION">DEFAULT_REGION_MEMSTORE_REPLICATION</a></code></td>
 <td class="colLast"><code>true</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.DEFAULT_REGION_REPLICATION">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#DEFAULT_REGION_REPLICATION">DEFAULT_REGION_REPLICATION</a></code></td>
 <td class="colLast"><code>1</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.DEFERRED_LOG_FLUSH">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#DEFERRED_LOG_FLUSH">DEFERRED_LOG_FLUSH</a></code></td>
 <td class="colLast"><code>"DEFERRED_LOG_FLUSH"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.DURABILITY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#DURABILITY">DURABILITY</a></code></td>
 <td class="colLast"><code>"DURABILITY"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.FLUSH_POLICY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#FLUSH_POLICY">FLUSH_POLICY</a></code></td>
 <td class="colLast"><code>"FLUSH_POLICY"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.IS_META">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#IS_META">IS_META</a></code></td>
 <td class="colLast"><code>"IS_META"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.IS_ROOT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#IS_ROOT">IS_ROOT</a></code></td>
 <td class="colLast"><code>"IS_ROOT"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.MAX_FILESIZE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#MAX_FILESIZE">MAX_FILESIZE</a></code></td>
 <td class="colLast"><code>"MAX_FILESIZE"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.MEMSTORE_FLUSHSIZE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#MEMSTORE_FLUSHSIZE">MEMSTORE_FLUSHSIZE</a></code></td>
 <td class="colLast"><code>"MEMSTORE_FLUSHSIZE"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.NAMESPACE_FAMILY_INFO">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#NAMESPACE_FAMILY_INFO">NAMESPACE_FAMILY_INFO</a></code></td>
 <td class="colLast"><code>"info"</code></td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.NORMALIZATION_ENABLED">
+<tr class="rowColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.NORMALIZATION_MODE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
-<td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#NORMALIZATION_ENABLED">NORMALIZATION_ENABLED</a></code></td>
-<td class="colLast"><code>"NORMALIZATION_ENABLED"</code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#NORMALIZATION_MODE">NORMALIZATION_MODE</a></code></td>
+<td class="colLast"><code>"NORMALIZATION_MODE"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.HTableDescriptor.OWNER">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#OWNER">OWNER</a></code></td>
 <td class="colLast"><code>"OWNER"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.READONLY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#READONLY">READONLY</a></code></td>
 <td class="colLast"><code>"READONLY"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.REGION_MEMSTORE_REPLICATION">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#REGION_MEMSTORE_REPLICATION">REGION_MEMSTORE_REPLICATION</a></code></td>
 <td class="colLast"><code>"REGION_MEMSTORE_REPLICATION"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.REGION_REPLICATION">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#REGION_REPLICATION">REGION_REPLICATION</a></code></td>
 <td class="colLast"><code>"REGION_REPLICATION"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.HTableDescriptor.SPLIT_POLICY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
@@ -3405,7 +3398,7 @@
 </li>
 <li class="blockList">
 <table border="0" cellpadding="3" cellspacing="0" summary="Constant Field 
Values table, listing constant fields, and values">
-<caption><span>org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/Tag.html" title="class in 
org.apache.hadoop.hbase">Tag</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<caption><span>org.apache.hadoop.hbase.<a 
href="org/apache/hadoop/hbase/Tag.html" title="interface in 
org.apache.hadoop.hbase">Tag</a></span><span 
class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -3806,20 +3799,13 @@
 <td class="colLast"><code>"hbase.client.nonces.enabled"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
name="org.apache.hadoop.hbase.client.ConnectionImplementation.keepAlive">
-<!--   -->
-</a><code>private&nbsp;static&nbsp;final&nbsp;long</code></td>
-<td><code><a 
href="org/apache/hadoop/hbase/client/ConnectionImplementation.html#keepAlive">keepAlive</a></code></td>
-<td class="colLast"><code>300000L</code></td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.client.ConnectionImplementation.RESOLVE_HOSTNAME_ON_FAIL_KEY">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/client/ConnectionImplementation.html#RESOLVE_HOSTNAME_ON_FAIL_KEY">RESOLVE_HOSTNAME_ON_FAIL_KEY</a></code></td>
 <td class="colLast"><code>"hbase.resolve.hostnames.on.failure"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.client.ConnectionImplementation.RETRIES_BY_SERVER_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
@@ -4914,6 +4900,25 @@
 <ul class="blockList">
 <li class="blockList">
 <table border="0" cellpadding="3" cellspacing="0" summary="Constant Field 
Values table, listing constant fields, and values">
+<caption><span>org.apache.hadoop.hbase.coprocessor.<a 
href="org/apache/hadoop/hbase/coprocessor/BypassCoprocessorException.html" 
title="class in 
org.apache.hadoop.hbase.coprocessor">BypassCoprocessorException</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.coprocessor.BypassCoprocessorException.serialVersionUID">
+<!--   -->
+</a><code>private&nbsp;static&nbsp;final&nbsp;long</code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/coprocessor/BypassCoprocessorException.html#serialVersionUID">serialVersionUID</a></code></td>
+<td class="colLast"><code>5943889011582357043L</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field 
Values table, listing constant fields, and values">
 <caption><span>org.apache.hadoop.hbase.coprocessor.<a 
href="org/apache/hadoop/hbase/coprocessor/CoprocessorException.html" 
title="class in 
org.apache.hadoop.hbase.coprocessor">CoprocessorException</a></span><span 
class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -5988,6 +5993,25 @@
 <ul class="blockList">
 <li class="blockList">
 <table border="0" cellpadding="3" cellspacing="0" summary="Constant Field 
Values table, listing constant fields, and values">
+<caption><span>org.apache.hadoop.hbase.io.<a 
href="org/apache/hadoop/hbase/io/ByteArrayOutputStream.html" title="class in 
org.apache.hadoop.hbase.io">ByteArrayOutputStream</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.io.ByteArrayOutputStream.MAX_ARRAY_SIZE">
+<!--   -->
+</a><code>private&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/io/ByteArrayOutputStream.html#MAX_ARRAY_SIZE">MAX_ARRAY_SIZE</a></code></td>
+<td class="colLast"><code>2147483639</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field 
Values table, listing constant fields, and values">
 <caption><span>org.apache.hadoop.hbase.io.<a 
href="org/apache/hadoop/hbase/io/ByteBufferOutputStream.html" title="class in 
org.apache.hadoop.hbase.io">ByteBufferOutputStream</a></span><span 
class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -9815,6 +9839,32 @@
 <ul class="blockList">
 <li class="blockList">
 <table border="0" cellpadding="3" cellspacing="0" summary="Constant Field 
Values table, listing constant fields, and values">
+<caption><span>org.apache.hadoop.hbase.master.<a 
href="org/apache/hadoop/hbase/master/ClusterSchema.html" title="interface in 
org.apache.hadoop.hbase.master">ClusterSchema</a></span><span 
class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.master.ClusterSchema.DEFAULT_HBASE_MASTER_CLUSTER_SCHEMA_OPERATION_TIMEOUT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/master/ClusterSchema.html#DEFAULT_HBASE_MASTER_CLUSTER_SCHEMA_OPERATION_TIMEOUT">DEFAULT_HBASE_MASTER_CLUSTER_SCHEMA_OPERATION_TIMEOUT</a></code></td>
+<td class="colLast"><code>300000</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.master.ClusterSchema.HBASE_MASTER_CLUSTER_SCHEMA_OPERATION_TIMEOUT_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/master/ClusterSchema.html#HBASE_MASTER_CLUSTER_SCHEMA_OPERATION_TIMEOUT_KEY">HBASE_MASTER_CLUSTER_SCHEMA_OPERATION_TIMEOUT_KEY</a></code></td>
+<td 
class="colLast"><code>"hbase.master.cluster.schema.operation.timeout"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field 
Values table, listing constant fields, and values">
 <caption><span>org.apache.hadoop.hbase.master.<a 
href="org/apache/hadoop/hbase/master/ClusterStatusPublisher.html" title="class 
in org.apache.hadoop.hbase.master">ClusterStatusPublisher</a></span><span 
class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -10335,6 +10385,20 @@
 <td class="colLast"><code>"masterStartTime"</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.master.MetricsMasterSource.MERGE_PLAN_COUNT_DESC">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/master/MetricsMasterSource.html#MERGE_PLAN_COUNT_DESC">MERGE_PLAN_COUNT_DESC</a></code></td>
+<td class="colLast"><code>"Number of Region Merge Plans executed"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.master.MetricsMasterSource.MERGE_PLAN_COUNT_NAME">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/master/MetricsMasterSource.html#MERGE_PLAN_COUNT_NAME">MERGE_PLAN_COUNT_NAME</a></code></td>
+<td class="colLast"><code>"mergePlanCount"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.master.MetricsMasterSource.METRICS_CONTEXT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
@@ -10405,6 +10469,20 @@
 <td class="colLast"><code>"serverName"</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.master.MetricsMasterSource.SPLIT_PLAN_COUNT_DESC">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/master/MetricsMasterSource.html#SPLIT_PLAN_COUNT_DESC">SPLIT_PLAN_COUNT_DESC</a></code></td>
+<td class="colLast"><code>"Number of Region Split Plans executed"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.master.MetricsMasterSource.SPLIT_PLAN_COUNT_NAME">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/master/MetricsMasterSource.html#SPLIT_PLAN_COUNT_NAME">SPLIT_PLAN_COUNT_NAME</a></code></td>
+<td class="colLast"><code>"splitPlanCount"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.master.MetricsMasterSource.ZOOKEEPER_QUORUM_DESC">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
@@ -15629,69 +15707,76 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HFILE_COMPACTION_DISCHARGER_THREAD_COUNT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HFILE_COMPACTION_DISCHARGER_THREAD_COUNT">HBASE_HFILE_COMPACTION_DISCHARGER_THREAD_COUNT</a></code></td>
+<td 
class="colLast"><code>"hbase.hfile.compaction.discharger.thread.count"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_COMPACTION_MAX_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_COMPACTION_MAX_KEY">HBASE_HSTORE_COMPACTION_MAX_KEY</a></code></td>
 <td class="colLast"><code>"hbase.hstore.compaction.max"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_COMPACTION_MAX_SIZE_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_COMPACTION_MAX_SIZE_KEY">HBASE_HSTORE_COMPACTION_MAX_SIZE_KEY</a></code></td>
 <td class="colLast"><code>"hbase.hstore.compaction.max.size"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_COMPACTION_MAX_SIZE_OFFPEAK_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_COMPACTION_MAX_SIZE_OFFPEAK_KEY">HBASE_HSTORE_COMPACTION_MAX_SIZE_OFFPEAK_KEY</a></code></td>
 <td 
class="colLast"><code>"hbase.hstore.compaction.max.size.offpeak"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_COMPACTION_MIN_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_COMPACTION_MIN_KEY">HBASE_HSTORE_COMPACTION_MIN_KEY</a></code></td>
 <td class="colLast"><code>"hbase.hstore.compaction.min"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_COMPACTION_MIN_SIZE_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_COMPACTION_MIN_SIZE_KEY">HBASE_HSTORE_COMPACTION_MIN_SIZE_KEY</a></code></td>
 <td class="colLast"><code>"hbase.hstore.compaction.min.size"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_COMPACTION_RATIO_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_COMPACTION_RATIO_KEY">HBASE_HSTORE_COMPACTION_RATIO_KEY</a></code></td>
 <td class="colLast"><code>"hbase.hstore.compaction.ratio"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_COMPACTION_RATIO_OFFPEAK_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_COMPACTION_RATIO_OFFPEAK_KEY">HBASE_HSTORE_COMPACTION_RATIO_OFFPEAK_KEY</a></code></td>
 <td class="colLast"><code>"hbase.hstore.compaction.ratio.offpeak"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_MIN_LOCALITY_TO_SKIP_MAJOR_COMPACT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_MIN_LOCALITY_TO_SKIP_MAJOR_COMPACT">HBASE_HSTORE_MIN_LOCALITY_TO_SKIP_MAJOR_COMPACT</a></code></td>
 <td 
class="colLast"><code>"hbase.hstore.min.locality.to.skip.major.compact"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_OFFPEAK_END_HOUR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.html#HBASE_HSTORE_OFFPEAK_END_HOUR">HBASE_HSTORE_OFFPEAK_END_HOUR</a></code></td>
 <td class="colLast"><code>"hbase.offpeak.end.hour"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration.HBASE_HSTORE_OFFPEAK_START_HOUR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
@@ -18215,75 +18300,89 @@
 <td class="colLast"><code>"snapshot.export.checksum.verify"</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_DEST_PREFIX">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_DEST_PREFIX">CONF_DEST_PREFIX</a></code></td>
+<td class="colLast"><code>"exportsnapshot.to."</code></td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_FILES_GROUP">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_FILES_GROUP">CONF_FILES_GROUP</a></code></td>
 <td class="colLast"><code>"snapshot.export.files.attributes.group"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_FILES_MODE">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_FILES_MODE">CONF_FILES_MODE</a></code></td>
 <td class="colLast"><code>"snapshot.export.files.attributes.mode"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_FILES_USER">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_FILES_USER">CONF_FILES_USER</a></code></td>
 <td class="colLast"><code>"snapshot.export.files.attributes.user"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_INPUT_ROOT">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_INPUT_ROOT">CONF_INPUT_ROOT</a></code></td>
 <td class="colLast"><code>"snapshot.export.input.root"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_MAP_GROUP">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_MAP_GROUP">CONF_MAP_GROUP</a></code></td>
 <td class="colLast"><code>"snapshot.export.default.map.group"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_NUM_SPLITS">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_NUM_SPLITS">CONF_NUM_SPLITS</a></code></td>
 <td class="colLast"><code>"snapshot.export.format.splits"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_OUTPUT_ROOT">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_OUTPUT_ROOT">CONF_OUTPUT_ROOT</a></code></td>
 <td class="colLast"><code>"snapshot.export.output.root"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_SKIP_TMP">
 <!--   -->
 </a><code>protected&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_SKIP_TMP">CONF_SKIP_TMP</a></code></td>
 <td class="colLast"><code>"snapshot.export.skip.tmp"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_SNAPSHOT_DIR">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_SNAPSHOT_DIR">CONF_SNAPSHOT_DIR</a></code></td>
 <td class="colLast"><code>"snapshot.export.format.snapshot.dir"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_SNAPSHOT_NAME">
 <!--   -->
 </a><code>private&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_SNAPSHOT_NAME">CONF_SNAPSHOT_NAME</a></code></td>
 <td class="colLast"><code>"snapshot.export.format.snapshot.name"</code></td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_SOURCE_PREFIX">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td><code><a 
href="org/apache/hadoop/hbase/snapshot/ExportSnapshot.html#CONF_SOURCE_PREFIX">CONF_SOURCE_PREFIX</a></code></td>
+<td class="colLast"><code>"exportsnapshot.from."</code></td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><a 
name="org.apache.hadoop.hbase.snapshot.ExportSnapshot.CONF_TEST_FAILURE">
 <!--   -->
@@ -21509,6 +21608,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9577bd5e/devapidocs/deprecated-list.html
----------------------------------------------------------------------
diff --git a/devapidocs/deprecated-list.html b/devapidocs/deprecated-list.html
index 2a92799..bda1819 100644
--- a/devapidocs/deprecated-list.html
+++ b/devapidocs/deprecated-list.html
@@ -536,7 +536,8 @@
 </tr>
 <tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/ConnectionImplementation.html#getHTableDescriptor(byte[])">org.apache.hadoop.hbase.client.ConnectionImplementation.getHTableDescriptor(byte[])</a>
-<div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/client/Admin.html#getTableDescriptor(org.apache.hadoop.hbase.TableName)"><code>Admin.getTableDescriptor(org.apache.hadoop.hbase.TableName)</code></a>
 instead</i></div>
+<div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/client/Admin.html#getTableDescriptor(org.apache.hadoop.hbase.TableName)"><code>Admin.getTableDescriptor(org.apache.hadoop.hbase.TableName)</code></a>
+  instead</i></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -546,7 +547,8 @@
 </tr>
 <tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/ConnectionImplementation.html#getHTableDescriptor(org.apache.hadoop.hbase.TableName)">org.apache.hadoop.hbase.client.ConnectionImplementation.getHTableDescriptor(TableName)</a>
-<div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/client/Admin.html#getTableDescriptor(org.apache.hadoop.hbase.TableName)"><code>Admin.getTableDescriptor(org.apache.hadoop.hbase.TableName)</code></a>
 instead</i></div>
+<div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/client/Admin.html#getTableDescriptor(org.apache.hadoop.hbase.TableName)"><code>Admin.getTableDescriptor(org.apache.hadoop.hbase.TableName)</code></a>
+  instead</i></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -556,7 +558,9 @@
 </tr>
 <tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/ConnectionImplementation.html#getHTableDescriptors(java.util.List)">org.apache.hadoop.hbase.client.ConnectionImplementation.getHTableDescriptors(List<String>)</a>
-<div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/client/Admin.html#getTableDescriptorsByTableName(java.util.List)"><code>Admin.getTableDescriptorsByTableName(java.util.List)</code></a>
 instead</i></div>
+<div class="block"><i>Use
+  <a 
href="org/apache/hadoop/hbase/client/Admin.html#getTableDescriptorsByTableName(java.util.List)"><code>Admin.getTableDescriptorsByTableName(java.util.List)</code></a>
+  instead</i></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -1179,7 +1183,7 @@
 </tr>
 <tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/ConnectionImplementation.html#processBatch(java.util.List,%20org.apache.hadoop.hbase.TableName,%20java.util.concurrent.ExecutorService,%20java.lang.Object[])">org.apache.hadoop.hbase.client.ConnectionImplementation.processBatch(List<?
 extends Row>, TableName, ExecutorService, Object[])</a>
-<div class="block"><i>since 0.96 - Use <a 
href="org/apache/hadoop/hbase/client/Table.html#batch(java.util.List,%20java.lang.Object[])"><code>Table.batch(java.util.List&lt;?
 extends org.apache.hadoop.hbase.client.Row&gt;, java.lang.Object[])</code></a> 
instead</i></div>
+<div class="block"><i>since 0.96 Use <a 
href="org/apache/hadoop/hbase/client/Table.html#batch(java.util.List,%20java.lang.Object[])"><code>Table.batch(java.util.List&lt;?
 extends org.apache.hadoop.hbase.client.Row&gt;, java.lang.Object[])</code></a> 
instead</i></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -1199,8 +1203,8 @@
 </tr>
 <tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/ConnectionImplementation.html#processBatchCallback(java.util.List,%20org.apache.hadoop.hbase.TableName,%20java.util.concurrent.ExecutorService,%20java.lang.Object[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)">org.apache.hadoop.hbase.client.ConnectionImplementation.processBatchCallback(List<?
 extends Row>, TableName, ExecutorService, Object[], Batch.Callback<R>)</a>
-<div class="block"><i>since 0.96 -
-   Use <a 
href="org/apache/hadoop/hbase/client/HTable.html#processBatchCallback(java.util.List,%20java.lang.Object[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)"><code>HTable.processBatchCallback(java.util.List&lt;?
 extends org.apache.hadoop.hbase.client.Row&gt;, java.lang.Object[], 
org.apache.hadoop.hbase.client.coprocessor.Batch.Callback&lt;R&gt;)</code></a> 
instead</i></div>
+<div class="block"><i>since 0.96
+  Use <a 
href="org/apache/hadoop/hbase/client/HTable.html#processBatchCallback(java.util.List,%20java.lang.Object[],%20org.apache.hadoop.hbase.client.coprocessor.Batch.Callback)"><code>HTable.processBatchCallback(java.util.List&lt;?
 extends org.apache.hadoop.hbase.client.Row&gt;, java.lang.Object[], 
org.apache.hadoop.hbase.client.coprocessor.Batch.Callback&lt;R&gt;)</code></a> 
instead</i></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -1381,49 +1385,55 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a 
href="org/apache/hadoop/hbase/CellUtil.html#tagsIterator(byte[],%20int,%20int)">org.apache.hadoop.hbase.CellUtil.tagsIterator(byte[],
 int, int)</a>
+<div class="block"><i>As of 2.0.0 and will be removed in 3.0.0
+             Instead use <a 
href="org/apache/hadoop/hbase/CellUtil.html#tagsIterator(org.apache.hadoop.hbase.Cell)"><code>CellUtil.tagsIterator(Cell)</code></a></i></div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#toIntUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toIntUnsafe(byte[],
 int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#toLongUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toLongUnsafe(byte[],
 int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#toShortUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toShortUnsafe(byte[],
 int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/regionserver/wal/Compressor.html#uncompressIntoArray(byte[],%20int,%20java.io.DataInput,%20org.apache.hadoop.hbase.io.util.Dictionary)">org.apache.hadoop.hbase.regionserver.wal.Compressor.uncompressIntoArray(byte[],
 int, DataInput, Dictionary)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/HConnection.html#updateCachedLocations(byte[],%20byte[],%20java.lang.Object,%20org.apache.hadoop.hbase.HRegionLocation)">org.apache.hadoop.hbase.client.HConnection.updateCachedLocations(byte[],
 byte[], Object, HRegionLocation)</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/HConnection.html#updateCachedLocations(org.apache.hadoop.hbase.TableName,%20byte[],%20byte[],%20java.lang.Object,%20org.apache.hadoop.hbase.ServerName)">org.apache.hadoop.hbase.client.HConnection.updateCachedLocations(TableName,
 byte[], byte[], Object, ServerName)</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/HConnection.html#updateCachedLocations(org.apache.hadoop.hbase.TableName,%20byte[],%20java.lang.Object,%20org.apache.hadoop.hbase.HRegionLocation)">org.apache.hadoop.hbase.client.HConnection.updateCachedLocations(TableName,
 byte[], Object, HRegionLocation)</a>
 <div class="block"><i>internal method, do not use through HConnection</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/zookeeper/ZKUtil.html#updateExistingNodeData(org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher,%20java.lang.String,%20byte[],%20int)">org.apache.hadoop.hbase.zookeeper.ZKUtil.updateExistingNodeData(ZooKeeperWatcher,
 String, byte[], int)</a>
 <div class="block"><i>Unused</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/regionserver/wal/HLogKey.html#write(java.io.DataOutput)">org.apache.hadoop.hbase.regionserver.wal.HLogKey.write(DataOutput)</a>
 <div class="block"><i>Don't use these Writables methods. Use PB 
instead.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/regionserver/wal/Compressor.html#writeCompressed(byte[],%20int,%20int,%20java.io.DataOutput,%20org.apache.hadoop.hbase.io.util.Dictionary)">org.apache.hadoop.hbase.regionserver.wal.Compressor.writeCompressed(byte[],
 int, int, DataOutput, Dictionary)</a></td>
 </tr>
 </tbody>
@@ -1563,6 +1573,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9577bd5e/devapidocs/help-doc.html
----------------------------------------------------------------------
diff --git a/devapidocs/help-doc.html b/devapidocs/help-doc.html
index 6bfa499..6f7672a 100644
--- a/devapidocs/help-doc.html
+++ b/devapidocs/help-doc.html
@@ -215,6 +215,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2015 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2016 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
 </body>
 </html>

Reply via email to