http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/client/ImmutableHColumnDescriptor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/ImmutableHColumnDescriptor.html 
b/devapidocs/org/apache/hadoop/hbase/client/ImmutableHColumnDescriptor.html
index c800c26..1ebfe64 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/ImmutableHColumnDescriptor.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/ImmutableHColumnDescriptor.html
@@ -141,7 +141,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html"
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.hadoop.hbase.<a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html" 
title="class in org.apache.hadoop.hbase">HColumnDescriptor</a></h3>
-<code><a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#BLOCKCACHE">BLOCKCACHE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#BLOCKSIZE">BLOCKSIZE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#BLOOMFILTER">BLOOMFILTER</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#CACHE_BLOOMS_ON_WRITE">CACHE_BLOOMS_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#CACHE_DATA_IN_L1">CACHE_DATA_IN_L1</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#CACHE_DATA_ON_WRITE">CACHE_DATA_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#CACHE_INDEX_ON_WRITE">CACHE_INDEX_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#COMPRESS_TAGS">COMPRESS_TAGS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#COMPRESSION">COMPRESSION</a>,
 <a href="../../../..
 
/../org/apache/hadoop/hbase/HColumnDescriptor.html#COMPRESSION_COMPACT">COMPRESSION_COMPACT</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DATA_BLOCK_ENCODING">DATA_BLOCK_ENCODING</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_BLOCKCACHE">DEFAULT_BLOCKCACHE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_BLOCKSIZE">DEFAULT_BLOCKSIZE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_BLOOMFILTER">DEFAULT_BLOOMFILTER</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_CACHE_BLOOMS_ON_WRITE">DEFAULT_CACHE_BLOOMS_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_CACHE_DATA_IN_L1">DEFAULT_CACHE_DATA_IN_L1</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_CACHE_DATA_ON_WRITE">DEFAULT_CACHE_DATA_ON_WRITE</a>,
 <a href="../../../../../org/apache/hadoop
 
/hbase/HColumnDescriptor.html#DEFAULT_CACHE_INDEX_ON_WRITE">DEFAULT_CACHE_INDEX_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_COMPRESS_TAGS">DEFAULT_COMPRESS_TAGS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_COMPRESSION">DEFAULT_COMPRESSION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_DATA_BLOCK_ENCODING">DEFAULT_DATA_BLOCK_ENCODING</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_DFS_REPLICATION">DEFAULT_DFS_REPLICATION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_ENCODE_ON_DISK">DEFAULT_ENCODE_ON_DISK</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_EVICT_BLOCKS_ON_CLOSE">DEFAULT_EVICT_BLOCKS_ON_CLOSE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_IN_MEMORY">DEFAULT_IN_MEMORY</a>,
 <a href="../../../../../org/apache
 
/hadoop/hbase/HColumnDescriptor.html#DEFAULT_KEEP_DELETED">DEFAULT_KEEP_DELETED</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_MIN_VERSIONS">DEFAULT_MIN_VERSIONS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_MOB_COMPACT_PARTITION_POLICY">DEFAULT_MOB_COMPACT_PARTITION_POLICY</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_MOB_THRESHOLD">DEFAULT_MOB_THRESHOLD</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_PREFETCH_BLOCKS_ON_OPEN">DEFAULT_PREFETCH_BLOCKS_ON_OPEN</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_REPLICATION_SCOPE">DEFAULT_REPLICATION_SCOPE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_TTL">DEFAULT_TTL</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_VERSIONS">DEFAULT_VERSIONS</a>,
 <a href="../../../../../org/apache/hado
 op/hbase/HColumnDescriptor.html#delegatee">delegatee</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DFS_REPLICATION">DFS_REPLICATION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#ENCODE_ON_DISK">ENCODE_ON_DISK</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#ENCRYPTION">ENCRYPTION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#ENCRYPTION_KEY">ENCRYPTION_KEY</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#EVICT_BLOCKS_ON_CLOSE">EVICT_BLOCKS_ON_CLOSE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#FOREVER">FOREVER</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#IN_MEMORY_COMPACTION">IN_MEMORY_COMPACTION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#IS_MOB">IS_MOB</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#IS_MOB_BYTES">IS_MOB_B
 YTES</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#KEEP_DELETED_CELLS">KEEP_DELETED_CELLS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#LENGTH">LENGTH</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MIN_VERSIONS">MIN_VERSIONS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MOB_COMPACT_PARTITION_POLICY">MOB_COMPACT_PARTITION_POLICY</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MOB_COMPACT_PARTITION_POLICY_BYTES">MOB_COMPACT_PARTITION_POLICY_BYTES</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MOB_THRESHOLD">MOB_THRESHOLD</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MOB_THRESHOLD_BYTES">MOB_THRESHOLD_BYTES</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#PREFETCH_BLOCKS_ON_OPEN">PREFETCH_BLOCKS_ON_OPEN</a>,
 <a href="../../../../../org/apache/hadoop/hbase/H
 ColumnDescriptor.html#REPLICATION_SCOPE">REPLICATION_SCOPE</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#REPLICATION_SCOPE_BYTES">REPLICATION_SCOPE_BYTES</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#STORAGE_POLICY">STORAGE_POLICY</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#TTL">TTL</a></code></li>
+<code><a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#BLOCKCACHE">BLOCKCACHE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#BLOCKSIZE">BLOCKSIZE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#BLOOMFILTER">BLOOMFILTER</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#CACHE_BLOOMS_ON_WRITE">CACHE_BLOOMS_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#CACHE_DATA_IN_L1">CACHE_DATA_IN_L1</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#CACHE_DATA_ON_WRITE">CACHE_DATA_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#CACHE_INDEX_ON_WRITE">CACHE_INDEX_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#COMPRESS_TAGS">COMPRESS_TAGS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#COMPRESSION">COMPRESSION</a>,
 <a href="../../../..
 
/../org/apache/hadoop/hbase/HColumnDescriptor.html#COMPRESSION_COMPACT">COMPRESSION_COMPACT</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DATA_BLOCK_ENCODING">DATA_BLOCK_ENCODING</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_BLOCKCACHE">DEFAULT_BLOCKCACHE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_BLOCKSIZE">DEFAULT_BLOCKSIZE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_BLOOMFILTER">DEFAULT_BLOOMFILTER</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_CACHE_BLOOMS_ON_WRITE">DEFAULT_CACHE_BLOOMS_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_CACHE_DATA_IN_L1">DEFAULT_CACHE_DATA_IN_L1</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_CACHE_DATA_ON_WRITE">DEFAULT_CACHE_DATA_ON_WRITE</a>,
 <a href="../../../../../org/apache/hadoop
 
/hbase/HColumnDescriptor.html#DEFAULT_CACHE_INDEX_ON_WRITE">DEFAULT_CACHE_INDEX_ON_WRITE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_COMPRESS_TAGS">DEFAULT_COMPRESS_TAGS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_COMPRESSION">DEFAULT_COMPRESSION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_DATA_BLOCK_ENCODING">DEFAULT_DATA_BLOCK_ENCODING</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_DFS_REPLICATION">DEFAULT_DFS_REPLICATION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_ENCODE_ON_DISK">DEFAULT_ENCODE_ON_DISK</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_EVICT_BLOCKS_ON_CLOSE">DEFAULT_EVICT_BLOCKS_ON_CLOSE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_IN_MEMORY">DEFAULT_IN_MEMORY</a>,
 <a href="../../../../../org/apache
 
/hadoop/hbase/HColumnDescriptor.html#DEFAULT_KEEP_DELETED">DEFAULT_KEEP_DELETED</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_MIN_VERSIONS">DEFAULT_MIN_VERSIONS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_MOB_COMPACT_PARTITION_POLICY">DEFAULT_MOB_COMPACT_PARTITION_POLICY</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_MOB_THRESHOLD">DEFAULT_MOB_THRESHOLD</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_NEW_VERSION_BEHAVIOR">DEFAULT_NEW_VERSION_BEHAVIOR</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_PREFETCH_BLOCKS_ON_OPEN">DEFAULT_PREFETCH_BLOCKS_ON_OPEN</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_REPLICATION_SCOPE">DEFAULT_REPLICATION_SCOPE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_TTL">DEFAULT_TTL</a>,
 <a href="../../
 
../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DEFAULT_VERSIONS">DEFAULT_VERSIONS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#delegatee">delegatee</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#DFS_REPLICATION">DFS_REPLICATION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#ENCODE_ON_DISK">ENCODE_ON_DISK</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#ENCRYPTION">ENCRYPTION</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#ENCRYPTION_KEY">ENCRYPTION_KEY</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#EVICT_BLOCKS_ON_CLOSE">EVICT_BLOCKS_ON_CLOSE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#FOREVER">FOREVER</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#IN_MEMORY_COMPACTION">IN_MEMORY_COMPACTION</a>,
 <a href="../../../../../org/apache/hadoop/hbase/H
 ColumnDescriptor.html#IS_MOB">IS_MOB</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#IS_MOB_BYTES">IS_MOB_BYTES</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#KEEP_DELETED_CELLS">KEEP_DELETED_CELLS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#LENGTH">LENGTH</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MIN_VERSIONS">MIN_VERSIONS</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MOB_COMPACT_PARTITION_POLICY">MOB_COMPACT_PARTITION_POLICY</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MOB_COMPACT_PARTITION_POLICY_BYTES">MOB_COMPACT_PARTITION_POLICY_BYTES</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MOB_THRESHOLD">MOB_THRESHOLD</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#MOB_THRESHOLD_BYTES">MOB_THRESHOLD_BYTES</a>,
 <a href="../../../../../org/apache/hado
 
op/hbase/HColumnDescriptor.html#NEW_VERSION_BEHAVIOR">NEW_VERSION_BEHAVIOR</a>, 
<a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#PREFETCH_BLOCKS_ON_OPEN">PREFETCH_BLOCKS_ON_OPEN</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#REPLICATION_SCOPE">REPLICATION_SCOPE</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#REPLICATION_SCOPE_BYTES">REPLICATION_SCOPE_BYTES</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#STORAGE_POLICY">STORAGE_POLICY</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#TTL">TTL</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a 
name="fields.inherited.from.class.org.apache.hadoop.hbase.client.ColumnFamilyDescriptor">
@@ -200,7 +200,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html"
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.<a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html" 
title="class in org.apache.hadoop.hbase">HColumnDescriptor</a></h3>
-<code><a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#compareTo-org.apache.hadoop.hbase.HColumnDescriptor-">compareTo</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#equals-java.lang.Object-">equals</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getBlocksize--">getBlocksize</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getBloomFilterType--">getBloomFilterType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getCompactionCompression--">getCompactionCompression</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getCompactionCompressionType--">getCompactionCompressionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getCompression--">getCompression</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getCompressionType--">getCompressionType</a>,
 <a href="../../../../../org/
 
apache/hadoop/hbase/HColumnDescriptor.html#getConfiguration--">getConfiguration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getConfigurationValue-java.lang.String-">getConfigurationValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getDataBlockEncoding--">getDataBlockEncoding</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getDefaultValues--">getDefaultValues</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getDFSReplication--">getDFSReplication</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getEncryptionKey--">getEncryptionKey</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getEncryptionType--">getEncryptionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getInMemoryCompaction--">getInMemoryCompaction</a>,
 <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#ge
 tKeepDeletedCells--">getKeepDeletedCells</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getMaxVersions--">getMaxVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getMinVersions--">getMinVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getMobCompactPartitionPolicy--">getMobCompactPartitionPolicy</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getMobThreshold--">getMobThreshold</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getName--">getName</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getNameAsString--">getNameAsString</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getScope--">getScope</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getStoragePolicy--">getStoragePolicy</a>,
 <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.htm
 l#getTimeToLive--">getTimeToLive</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getUnit-java.lang.String-">getUnit</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getValue-byte:A-">getValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getValue-org.apache.hadoop.hbase.util.Bytes-">getValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getValue-java.lang.String-">getValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getValues--">getValues</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#hashCode--">hashCode</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isBlockCacheEnabled--">isBlockCacheEnabled</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isCacheBloomsOnWrite--">isCacheBloomsOnWrite</a>,
 <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor
 .html#isCacheDataInL1--">isCacheDataInL1</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isCacheDataOnWrite--">isCacheDataOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isCacheIndexesOnWrite--">isCacheIndexesOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isCompressTags--">isCompressTags</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isEvictBlocksOnClose--">isEvictBlocksOnClose</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isInMemory--">isInMemory</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isLegalFamilyName-byte:A-">isLegalFamilyName</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isMobEnabled--">isMobEnabled</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isPrefetchBlocksOnOpen--">isPrefetchBlocksOnOpen</a>,
 <a href="../../../../../org/a
 pache/hadoop/hbase/HColumnDescriptor.html#parseFrom-byte:A-">parseFrom</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#remove-byte:A-">remove</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#removeConfiguration-java.lang.String-">removeConfiguration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setBlockCacheEnabled-boolean-">setBlockCacheEnabled</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setBlocksize-int-">setBlocksize</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setBloomFilterType-org.apache.hadoop.hbase.regionserver.BloomType-">setBloomFilterType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCacheBloomsOnWrite-boolean-">setCacheBloomsOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCacheDataInL1-boolean-">setCacheDataInL1</a>,
 <a href="../../../../../org/apache/had
 
oop/hbase/HColumnDescriptor.html#setCacheDataOnWrite-boolean-">setCacheDataOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCacheIndexesOnWrite-boolean-">setCacheIndexesOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCompactionCompressionType-org.apache.hadoop.hbase.io.compress.Compression.Algorithm-">setCompactionCompressionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCompressionType-org.apache.hadoop.hbase.io.compress.Compression.Algorithm-">setCompressionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCompressTags-boolean-">setCompressTags</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setConfiguration-java.lang.String-java.lang.String-">setConfiguration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setDataBlockEncoding-org.apache.hadoop.hbase.io.encoding.DataBlockEncoding
 -">setDataBlockEncoding</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setDFSReplication-short-">setDFSReplication</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setEncryptionKey-byte:A-">setEncryptionKey</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setEncryptionType-java.lang.String-">setEncryptionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setEvictBlocksOnClose-boolean-">setEvictBlocksOnClose</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setInMemory-boolean-">setInMemory</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setInMemoryCompaction-org.apache.hadoop.hbase.MemoryCompactionPolicy-">setInMemoryCompaction</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setKeepDeletedCells-org.apache.hadoop.hbase.KeepDeletedCells-">setKeepDeletedCells</a>,
 <a href="../../../../../org/ap
 
ache/hadoop/hbase/HColumnDescriptor.html#setMaxVersions-int-">setMaxVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMinVersions-int-">setMinVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMobCompactPartitionPolicy-org.apache.hadoop.hbase.client.MobCompactPartitionPolicy-">setMobCompactPartitionPolicy</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMobEnabled-boolean-">setMobEnabled</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMobThreshold-long-">setMobThreshold</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setPrefetchBlocksOnOpen-boolean-">setPrefetchBlocksOnOpen</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setScope-int-">setScope</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setStoragePolicy-java.lang.String-">setStoragePolicy</a>,
 <a href="../../../
 
../../org/apache/hadoop/hbase/HColumnDescriptor.html#setTimeToLive-int-">setTimeToLive</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setTimeToLive-java.lang.String-">setTimeToLive</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setValue-byte:A-byte:A-">setValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setValue-java.lang.String-java.lang.String-">setValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setVersions-int-int-">setVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#toByteArray--">toByteArray</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#toString--">toString</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#toStringCustomizedValues--">toStringCustomizedValues</a></code></li>
+<code><a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#compareTo-org.apache.hadoop.hbase.HColumnDescriptor-">compareTo</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#equals-java.lang.Object-">equals</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getBlocksize--">getBlocksize</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getBloomFilterType--">getBloomFilterType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getCompactionCompression--">getCompactionCompression</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getCompactionCompressionType--">getCompactionCompressionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getCompression--">getCompression</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getCompressionType--">getCompressionType</a>,
 <a href="../../../../../org/
 
apache/hadoop/hbase/HColumnDescriptor.html#getConfiguration--">getConfiguration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getConfigurationValue-java.lang.String-">getConfigurationValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getDataBlockEncoding--">getDataBlockEncoding</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getDefaultValues--">getDefaultValues</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getDFSReplication--">getDFSReplication</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getEncryptionKey--">getEncryptionKey</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getEncryptionType--">getEncryptionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getInMemoryCompaction--">getInMemoryCompaction</a>,
 <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#ge
 tKeepDeletedCells--">getKeepDeletedCells</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getMaxVersions--">getMaxVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getMinVersions--">getMinVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getMobCompactPartitionPolicy--">getMobCompactPartitionPolicy</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getMobThreshold--">getMobThreshold</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getName--">getName</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getNameAsString--">getNameAsString</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getScope--">getScope</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getStoragePolicy--">getStoragePolicy</a>,
 <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.htm
 l#getTimeToLive--">getTimeToLive</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getUnit-java.lang.String-">getUnit</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getValue-byte:A-">getValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getValue-org.apache.hadoop.hbase.util.Bytes-">getValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getValue-java.lang.String-">getValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#getValues--">getValues</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#hashCode--">hashCode</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isBlockCacheEnabled--">isBlockCacheEnabled</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isCacheBloomsOnWrite--">isCacheBloomsOnWrite</a>,
 <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor
 .html#isCacheDataInL1--">isCacheDataInL1</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isCacheDataOnWrite--">isCacheDataOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isCacheIndexesOnWrite--">isCacheIndexesOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isCompressTags--">isCompressTags</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isEvictBlocksOnClose--">isEvictBlocksOnClose</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isInMemory--">isInMemory</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isLegalFamilyName-byte:A-">isLegalFamilyName</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isMobEnabled--">isMobEnabled</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#isNewVersionBehavior--">isNewVersionBehavior</a>,
 <a href="../../../../../org/apach
 
e/hadoop/hbase/HColumnDescriptor.html#isPrefetchBlocksOnOpen--">isPrefetchBlocksOnOpen</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#parseFrom-byte:A-">parseFrom</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#remove-byte:A-">remove</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#removeConfiguration-java.lang.String-">removeConfiguration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setBlockCacheEnabled-boolean-">setBlockCacheEnabled</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setBlocksize-int-">setBlocksize</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setBloomFilterType-org.apache.hadoop.hbase.regionserver.BloomType-">setBloomFilterType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCacheBloomsOnWrite-boolean-">setCacheBloomsOnWrite</a>,
 <a href="../../../../../org/apache/ha
 
doop/hbase/HColumnDescriptor.html#setCacheDataInL1-boolean-">setCacheDataInL1</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCacheDataOnWrite-boolean-">setCacheDataOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCacheIndexesOnWrite-boolean-">setCacheIndexesOnWrite</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCompactionCompressionType-org.apache.hadoop.hbase.io.compress.Compression.Algorithm-">setCompactionCompressionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCompressionType-org.apache.hadoop.hbase.io.compress.Compression.Algorithm-">setCompressionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setCompressTags-boolean-">setCompressTags</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setConfiguration-java.lang.String-java.lang.String-">setConfiguration</a>,
 <a href="../../../../../
 
org/apache/hadoop/hbase/HColumnDescriptor.html#setDataBlockEncoding-org.apache.hadoop.hbase.io.encoding.DataBlockEncoding-">setDataBlockEncoding</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setDFSReplication-short-">setDFSReplication</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setEncryptionKey-byte:A-">setEncryptionKey</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setEncryptionType-java.lang.String-">setEncryptionType</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setEvictBlocksOnClose-boolean-">setEvictBlocksOnClose</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setInMemory-boolean-">setInMemory</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setInMemoryCompaction-org.apache.hadoop.hbase.MemoryCompactionPolicy-">setInMemoryCompaction</a>,
 <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.ht
 
ml#setKeepDeletedCells-org.apache.hadoop.hbase.KeepDeletedCells-">setKeepDeletedCells</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMaxVersions-int-">setMaxVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMinVersions-int-">setMinVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMobCompactPartitionPolicy-org.apache.hadoop.hbase.client.MobCompactPartitionPolicy-">setMobCompactPartitionPolicy</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMobEnabled-boolean-">setMobEnabled</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setMobThreshold-long-">setMobThreshold</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setNewVersionBehavior-boolean-">setNewVersionBehavior</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setPrefetchBlocksOnOpen-boolean-">setPrefetchBlocksOnOpen</
 a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setScope-int-">setScope</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setStoragePolicy-java.lang.String-">setStoragePolicy</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setTimeToLive-int-">setTimeToLive</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setTimeToLive-java.lang.String-">setTimeToLive</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setValue-byte:A-byte:A-">setValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setValue-java.lang.String-java.lang.String-">setValue</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#setVersions-int-int-">setVersions</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#toByteArray--">toByteArray</a>,
 <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#toStrin
 g--">toString</a>, <a 
href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html#toStringCustomizedValues--">toStringCustomizedValues</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.html 
b/devapidocs/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.html
index 49b1f26..6ab0cb0 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/client/ZooKeeperKeepAliveConnection.html
@@ -212,7 +212,7 @@ extends <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatch
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.zookeeper.<a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" 
title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a></h3>
-<code><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#abort-java.lang.String-java.lang.Throwable-">abort</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#checkAndSetZNodeAcls--">checkAndSetZNodeAcls</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getConfiguration--">getConfiguration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getListeners--">getListeners</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getMetaReplicaNodes--">getMetaReplicaNodes</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getNumberOfListeners--">getNumberOfListeners</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getQuorum--">getQuorum</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getRecoverableZooKeeper--">getRecoverableZo
 oKeeper</a>, <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getZNodePaths--">getZNodePaths</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#interruptedException-java.lang.InterruptedException-">interruptedException</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#isAborted--">isAborted</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#isClientReadable-java.lang.String-">isClientReadable</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#isSuperUserId-java.lang.String:A-org.apache.zookeeper.data.Id-">isSuperUserId</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#keeperException-org.apache.zookeeper.KeeperException-">keeperException</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#prefix-java.lang.String-">prefix</a>,
 <a href="../../../../../o
 
rg/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#process-org.apache.zookeeper.WatchedEvent-">process</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#reconnectAfterExpiration--">reconnectAfterExpiration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#registerListener-org.apache.hadoop.hbase.zookeeper.ZooKeeperListener-">registerListener</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#registerListenerFirst-org.apache.hadoop.hbase.zookeeper.ZooKeeperListener-">registerListenerFirst</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#sync-java.lang.String-">sync</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#toString--">toString</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#unregisterAllListeners--">unregisterAllListeners</a>,
 <a href="../../../../../org/apache/ha
 
doop/hbase/zookeeper/ZooKeeperWatcher.html#unregisterListener-org.apache.hadoop.hbase.zookeeper.ZooKeeperListener-">unregisterListener</a></code></li>
+<code><a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#abort-java.lang.String-java.lang.Throwable-">abort</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#checkAndSetZNodeAcls--">checkAndSetZNodeAcls</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getConfiguration--">getConfiguration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getListeners--">getListeners</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getMetaReplicaNodes--">getMetaReplicaNodes</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getNumberOfListeners--">getNumberOfListeners</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getQuorum--">getQuorum</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getRecoverableZooKeeper--">getRecoverableZo
 oKeeper</a>, <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#getZNodePaths--">getZNodePaths</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#interruptedException-java.lang.InterruptedException-">interruptedException</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#interruptedExceptionNoThrow-java.lang.InterruptedException-boolean-">interruptedExceptionNoThrow</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#isAborted--">isAborted</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#isClientReadable-java.lang.String-">isClientReadable</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#isSuperUserId-java.lang.String:A-org.apache.zookeeper.data.Id-">isSuperUserId</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#keeperException-org.apache.zookeeper.
 KeeperException-">keeperException</a>, <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#prefix-java.lang.String-">prefix</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#process-org.apache.zookeeper.WatchedEvent-">process</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#reconnectAfterExpiration--">reconnectAfterExpiration</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#registerListener-org.apache.hadoop.hbase.zookeeper.ZooKeeperListener-">registerListener</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#registerListenerFirst-org.apache.hadoop.hbase.zookeeper.ZooKeeperListener-">registerListenerFirst</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#sync-java.lang.String-">sync</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#toString--">toS
 tring</a>, <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#unregisterAllListeners--">unregisterAllListeners</a>,
 <a 
href="../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html#unregisterListener-org.apache.hadoop.hbase.zookeeper.ZooKeeperListener-">unregisterListener</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/client/class-use/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/class-use/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
index 69d2be9..62df128 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/client/class-use/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
@@ -307,47 +307,51 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setPrefetchBlocksOnOpen-boolean-">setPrefetchBlocksOnOpen</a></span>(boolean&nbsp;value)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setNewVersionBehavior-boolean-">setNewVersionBehavior</a></span>(boolean&nbsp;newVersionBehavior)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setScope-int-">setScope</a></span>(int&nbsp;scope)</code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setPrefetchBlocksOnOpen-boolean-">setPrefetchBlocksOnOpen</a></span>(boolean&nbsp;value)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setScope-int-">setScope</a></span>(int&nbsp;scope)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setStoragePolicy-java.lang.String-">setStoragePolicy</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;policy)</code>
 <div class="block">Set the storage policy for use with this family</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setTimeToLive-int-">setTimeToLive</a></span>(int&nbsp;timeToLive)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setTimeToLive-java.lang.String-">setTimeToLive</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&nbsp;timeToLive)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setValue-byte:A-byte:A-">setValue</a></span>(byte[]&nbsp;key,
         byte[]&nbsp;value)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setValue-org.apache.hadoop.hbase.util.Bytes-org.apache.hadoop.hbase.util.Bytes-">setValue</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/util/Bytes.html" title="class 
in org.apache.hadoop.hbase.util">Bytes</a>&nbsp;key,
         <a href="../../../../../../org/apache/hadoop/hbase/util/Bytes.html" 
title="class in 
org.apache.hadoop.hbase.util">Bytes</a>&nbsp;value)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setValue-org.apache.hadoop.hbase.util.Bytes-java.lang.String-">setValue</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/util/Bytes.html" title="class 
in org.apache.hadoop.hbase.util">Bytes</a>&nbsp;key,
         <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&nbsp;value)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setValue-java.lang.String-java.lang.String-">setValue</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;key,
         <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&nbsp;value)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html"
 title="class in 
org.apache.hadoop.hbase.client">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.</span><code><span
 class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html#setVersions-int-int-">setVersions</a></span>(int&nbsp;minVersions,
            int&nbsp;maxVersions)</code>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
index fa97c24..23fe2f3 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Scan.html
@@ -2221,13 +2221,13 @@ service.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/NormalUserScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">NormalUserScanQueryMatcher</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">NormalUserScanQueryMatcher.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/NormalUserScanQueryMatcher.html#create-org.apache.hadoop.hbase.client.Scan-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-boolean-long-long-org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost-">create</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
+<td class="colLast"><span 
class="typeNameLabel">NormalUserScanQueryMatcher.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/NormalUserScanQueryMatcher.html#create-org.apache.hadoop.hbase.client.Scan-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-boolean-long-long-">create</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
       <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo,
       <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">ColumnTracker</a>&nbsp;columns,
+      <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker</a>&nbsp;deletes,
       boolean&nbsp;hasNullColumn,
       long&nbsp;oldestUnexpiredTS,
-      long&nbsp;now,
-      <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">RegionCoprocessorHost</a>&nbsp;regionCoprocessorHost)</code>&nbsp;</td>
+      long&nbsp;now)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/UserScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">UserScanQueryMatcher</a></code></td>
@@ -2259,6 +2259,14 @@ service.</div>
 <td class="colLast"><span 
class="typeNameLabel">UserScanQueryMatcher.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/UserScanQueryMatcher.html#createStartKey-org.apache.hadoop.hbase.client.Scan-org.apache.hadoop.hbase.regionserver.ScanInfo-">createStartKey</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
               <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected static <a 
href="../../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in 
org.apache.hadoop.hbase.util">Pair</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker</a>,<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">ColumnTracker</a>&gt;</code></td>
+<td class="colLast"><span 
class="typeNameLabel">ScanQueryMatcher.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getTrackers-org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost-java.util.NavigableSet-org.apache.hadoop.hbase.regionserver.ScanInfo-long-org.apache.hadoop.hbase.client.Scan-">getTrackers</a></span>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">RegionCoprocessorHost</a>&nbsp;host,
+           <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/NavigableSet.html?is-external=true";
 title="class or interface in 
java.util">NavigableSet</a>&lt;byte[]&gt;&nbsp;columns,
+           <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo,
+           long&nbsp;oldestUnexpiredTS,
+           <a 
href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a>&nbsp;userScan)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Use table, listing constructors, and an explanation">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index 3f2dbbd..ec07dc7 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -538,25 +538,25 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/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.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RegionLocateType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Consistency</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Scan.ReadType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Durability.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">IsolationLevel</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Durability.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">HBaseAdmin.ReplicationState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">Consistency</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">SnapshotType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactionState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">TableState.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">IsolationLevel</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">RegionLocateType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">MasterSwitchType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" 
title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a 
href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html"
 title="enum in org.apache.hadoop.hbase.client"><span 
class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/exceptions/class-use/UnexpectedStateException.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/exceptions/class-use/UnexpectedStateException.html
 
b/devapidocs/org/apache/hadoop/hbase/exceptions/class-use/UnexpectedStateException.html
index d774923..f79026b 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/exceptions/class-use/UnexpectedStateException.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/exceptions/class-use/UnexpectedStateException.html
@@ -151,14 +151,6 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private void</code></td>
-<td class="colLast"><span 
class="typeNameLabel">AssignmentManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#updateRegionMergeTransition-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.HRegionInfo-org.apache.hadoop.hbase.HRegionInfo-">updateRegionMergeTransition</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class 
in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
-                           
org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode&nbsp;state,
-                           <a 
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class 
in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;merged,
-                           <a 
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class 
in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;hriA,
-                           <a 
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class 
in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;hriB)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>private void</code></td>
 <td class="colLast"><span 
class="typeNameLabel">AssignmentManager.</span><code><span 
class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/assignment/AssignmentManager.html#updateRegionTransition-org.apache.hadoop.hbase.ServerName-org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode-org.apache.hadoop.hbase.HRegionInfo-long-">updateRegionTransition</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class 
in org.apache.hadoop.hbase">ServerName</a>&nbsp;serverName,
                       
org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode&nbsp;state,
                       <a 
href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class 
in org.apache.hadoop.hbase">HRegionInfo</a>&nbsp;regionInfo,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html 
b/devapidocs/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html
index 9bd10fb..f71996f 100644
--- a/devapidocs/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html
+++ b/devapidocs/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html
@@ -248,7 +248,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html"
 title="enum in 
org.apache.hadoop.hbase.favored">FavoredNodesPlan.Position</a>[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html#line.144">values</a>()</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html"
 title="enum in 
org.apache.hadoop.hbase.favored">FavoredNodesPlan.Position</a>[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html#line.27">values</a>()</pre>
 <div class="block">Returns an array containing the constants of this enum 
type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
@@ -268,7 +268,7 @@ for (FavoredNodesPlan.Position c : 
FavoredNodesPlan.Position.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html"
 title="enum in 
org.apache.hadoop.hbase.favored">FavoredNodesPlan.Position</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html#line.144">valueOf</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html"
 title="enum in 
org.apache.hadoop.hbase.favored">FavoredNodesPlan.Position</a>&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/favored/FavoredNodesPlan.Position.html#line.27">valueOf</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified 
name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index bff8782..cd11058 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -175,14 +175,14 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/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.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html"
 title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html"
 title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html"
 title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">FilterList.Operator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html"
 title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">CompareFilter.CompareOp</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html"
 title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html"
 title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html"
 title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">CompareFilter.CompareOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">FilterList.Operator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html"
 title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a 
href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" 
title="enum in org.apache.hadoop.hbase.filter"><span 
class="typeNameLink">Filter.ReturnCode</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index b5a380e..cac54e3 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -273,12 +273,12 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">BlockType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" 
title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">BlockPriority</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">Cacheable.MemoryType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html"
 title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">HFileBlock.Writer.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html"
 title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html"
 title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">BlockType.BlockCategory</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">Cacheable.MemoryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html"
 title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">BlockType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/ipc/FailedServers.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/FailedServers.html 
b/devapidocs/org/apache/hadoop/hbase/ipc/FailedServers.html
index adabfbb..6bfbc4e 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/FailedServers.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/FailedServers.html
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre><a 
href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html"
 title="annotation in 
org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
-public class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.35">FailedServers</a>
+public class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.37">FailedServers</a>
 extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
 <div class="block">A class to manage a list of servers that failed 
recently.</div>
 </li>
@@ -140,6 +140,10 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/FailedServers.html#latestExpiry">latestExpiry</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private static 
org.apache.commons.logging.Log</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/FailedServers.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/FailedServers.html#recheckServersTimeout">recheckServersTimeout</a></span></code>&nbsp;</td>
 </tr>
@@ -177,7 +181,8 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/FailedServers.html#addToFailedServers-java.net.InetSocketAddress-">addToFailedServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/net/InetSocketAddress.html?is-external=true";
 title="class or interface in 
java.net">InetSocketAddress</a>&nbsp;address)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/ipc/FailedServers.html#addToFailedServers-java.net.InetSocketAddress-java.lang.Throwable-">addToFailedServers</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/net/InetSocketAddress.html?is-external=true";
 title="class or interface in java.net">InetSocketAddress</a>&nbsp;address,
+                  <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a>&nbsp;throwable)</code>
 <div class="block">Add an address to the list of the failed servers list.</div>
 </td>
 </tr>
@@ -215,7 +220,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>failedServers</h4>
-<pre>private final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">Map</a>&lt;<a 
href="http://docs.oracle.com/javase/8/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/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>&gt; <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.36">failedServers</a></pre>
+<pre>private final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">Map</a>&lt;<a 
href="http://docs.oracle.com/javase/8/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/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>&gt; <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.38">failedServers</a></pre>
 </li>
 </ul>
 <a name="latestExpiry">
@@ -224,16 +229,25 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>latestExpiry</h4>
-<pre>private&nbsp;long <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.37">latestExpiry</a></pre>
+<pre>private&nbsp;long <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.39">latestExpiry</a></pre>
 </li>
 </ul>
 <a name="recheckServersTimeout">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>recheckServersTimeout</h4>
-<pre>private final&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.38">recheckServersTimeout</a></pre>
+<pre>private final&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.40">recheckServersTimeout</a></pre>
+</li>
+</ul>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.apache.commons.logging.Log <a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.41">LOG</a></pre>
 </li>
 </ul>
 </li>
@@ -250,7 +264,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>FailedServers</h4>
-<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.40">FailedServers</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.43">FailedServers</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 </li>
@@ -261,13 +275,14 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="addToFailedServers-java.net.InetSocketAddress-">
+<a name="addToFailedServers-java.net.InetSocketAddress-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addToFailedServers</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.48">addToFailedServers</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/net/InetSocketAddress.html?is-external=true";
 title="class or interface in 
java.net">InetSocketAddress</a>&nbsp;address)</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.51">addToFailedServers</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/net/InetSocketAddress.html?is-external=true";
 title="class or interface in java.net">InetSocketAddress</a>&nbsp;address,
+                               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a>&nbsp;throwable)</pre>
 <div class="block">Add an address to the list of the failed servers list.</div>
 </li>
 </ul>
@@ -277,7 +292,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isFailedServer</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.59">isFailedServer</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/net/InetSocketAddress.html?is-external=true";
 title="class or interface in 
java.net">InetSocketAddress</a>&nbsp;address)</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/ipc/FailedServers.html#line.67">isFailedServer</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/net/InetSocketAddress.html?is-external=true";
 title="class or interface in 
java.net">InetSocketAddress</a>&nbsp;address)</pre>
 <div class="block">Check if the server should be considered as bad. Clean the 
old entries of the list.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>

Reply via email to