http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html
index c56aa24..33d9997 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html
@@ -634,7 +634,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>commitWriter</h4>
-<pre>protected abstract&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.325">commitWriter</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.html"
 title="type parameter in Compactor">T</a>&nbsp;writer,
+<pre>protected abstract&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.326">commitWriter</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.html"
 title="type parameter in Compactor">T</a>&nbsp;writer,
                                                                 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a>&nbsp;fd,
                                                                 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request)
                                                          throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
@@ -652,7 +652,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>abortWriter</h4>
-<pre>protected abstract&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.328">abortWriter</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.html"
 title="type parameter in Compactor">T</a>&nbsp;writer)
+<pre>protected abstract&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.329">abortWriter</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.html"
 title="type parameter in Compactor">T</a>&nbsp;writer)
                              throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -666,7 +666,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>preCreateCoprocScanner</h4>
-<pre>protected&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.340">preCreateCoprocScanner</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request,
+<pre>protected&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.341">preCreateCoprocScanner</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request,
                                                  <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" 
title="enum in org.apache.hadoop.hbase.regionserver">ScanType</a>&nbsp;scanType,
                                                  long&nbsp;earliestPutTs,
                                                  <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileScanner.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">StoreFileScanner</a>&gt;&nbsp;scanners,
@@ -695,7 +695,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>postCreateCoprocScanner</h4>
-<pre>protected&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.357">postCreateCoprocScanner</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request,
+<pre>protected&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.358">postCreateCoprocScanner</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request,
                                                   <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" 
title="enum in org.apache.hadoop.hbase.regionserver">ScanType</a>&nbsp;scanType,
                                                   <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;scanner,
                                                   <a 
href="../../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)
@@ -719,7 +719,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>performCompaction</h4>
-<pre>protected&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.377">performCompaction</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a>&nbsp;fd,
+<pre>protected&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.378">performCompaction</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a>&nbsp;fd,
                                     <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;scanner,
                                     <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/CellSink.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">CellSink</a>&nbsp;writer,
                                     long&nbsp;smallestReadPoint,
@@ -752,7 +752,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>createScanner</h4>
-<pre>protected&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.499">createScanner</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Store</a>&nbsp;store,
+<pre>protected&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.500">createScanner</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Store</a>&nbsp;store,
                                         <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileScanner.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">StoreFileScanner</a>&gt;&nbsp;scanners,
                                         <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" 
title="enum in org.apache.hadoop.hbase.regionserver">ScanType</a>&nbsp;scanType,
                                         long&nbsp;smallestReadPoint,
@@ -778,7 +778,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createScanner</h4>
-<pre>protected&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.516">createScanner</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Store</a>&nbsp;store,
+<pre>protected&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#line.517">createScanner</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Store</a>&nbsp;store,
                                         <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFileScanner.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">StoreFileScanner</a>&gt;&nbsp;scanners,
                                         long&nbsp;smallestReadPoint,
                                         long&nbsp;earliestPutTs,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.html
index b3aaecd..f7f639e 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.html
@@ -397,7 +397,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/compacti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getExpiredStores</h4>
-<pre>private&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true";
 title="class or interface in java.util">Collection</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.html#line.117">getExpiredStores</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true";
 title="class or interface in java.util">Collection</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;files,
+<pre>private&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true";
 title="class or interface in java.util">Collection</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/FIFOCompactionPolicy.html#line.116">getExpiredStores</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true";
 title="class or interface in java.util">Collection</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;files,
                                                <a 
href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true";
 title="class or interface in java.util">Collection</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;filesCompacting)</pre>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 582d47a..23b2728 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -692,20 +692,20 @@
 <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.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionOpeningState.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">RegionOpeningState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScannerContext.NextState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">Region.FlushResult.Result</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">Region.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" 
title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">BloomType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" 
title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">FlushType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" 
title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">StoreScanner.StoreScannerCompactionRace</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScannerContext.LimitScope</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">MemStoreCompactor.Action</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">StoreScanner.StoreScannerCompactionRace</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" 
title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">Region.FlushResult.Result</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">Region.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/RegionOpeningState.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">RegionOpeningState</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html
index 3e65254..75dcf45 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html
@@ -105,7 +105,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ExplicitColumnTracker</a>, 
<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanWildcardColumnTracker.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanWildcardColumnTracker</a></dd>
+<dd><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ExplicitColumnTracker</a>, 
<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/NewVersionBehaviorTracker.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">NewVersionBehaviorTracker</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanWildcardColumnTracker.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanWildcardColumnTracker</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.html"
 title="class in 
org.apache.hadoop.hbase.security.visibility">VisibilityNewVersionBehaivorTracker</a></dd>
 </dl>
 <hr>
 <br>
@@ -164,7 +164,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ShipperL
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher.MatchCode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html#checkVersions-org.apache.hadoop.hbase.Cell-long-byte-boolean-">checkVersions</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
-             long&nbsp;ttl,
+             long&nbsp;timestamp,
              byte&nbsp;type,
              boolean&nbsp;ignoreCount)</code>
 <div class="block">Keeps track of the number of versions for the columns asked 
for.</div>
@@ -256,7 +256,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ShipperL
 <li class="blockList">
 <h4>checkVersions</h4>
 <pre><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher.MatchCode</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html#line.89">checkVersions</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
-                                         long&nbsp;ttl,
+                                         long&nbsp;timestamp,
                                          byte&nbsp;type,
                                          boolean&nbsp;ignoreCount)
                                   throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
@@ -271,7 +271,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ShipperL
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>cell</code> - </dd>
-<dd><code>ttl</code> - The timeToLive to enforce.</dd>
+<dd><code>timestamp</code> - The timestamp of the cell.</dd>
 <dd><code>type</code> - the type of the key value (Put/Delete)</dd>
 <dd><code>ignoreCount</code> - indicates if the KV needs to be excluded while 
counting (used during
           compactions. We only count KV's that are older than all the 
scanners' read points.)</dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html
index 61adb35..0c174d3 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html
@@ -123,7 +123,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 abstract class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.36">CompactionScanQueryMatcher</a>
+public abstract class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.37">CompactionScanQueryMatcher</a>
 extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher</a></pre>
 <div class="block">Query matcher for compaction.</div>
 </li>
@@ -201,8 +201,9 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#CompactionScanQueryMatcher-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-long-long-long-">CompactionScanQueryMatcher</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#CompactionScanQueryMatcher-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-long-long-long-">CompactionScanQueryMatcher</a></span>(<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/DeleteTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker</a>&nbsp;deletes,
+                          <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">ColumnTracker</a>&nbsp;columnTracker,
                           long&nbsp;readPointToUse,
                           long&nbsp;oldestUnexpiredTS,
                           long&nbsp;now)</code>&nbsp;</td>
@@ -276,7 +277,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <!--   -->
 </a>
 <h3>Methods inherited from 
class&nbsp;org.apache.hadoop.hbase.regionserver.querymatcher.<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher</a></h3>
-<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#checkColumn-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-byte:A-int-int-long-byte-boolean-">checkColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#checkDeleted-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-org.apache.hadoop.hbase.Cell-">checkDeleted</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#clearCurrentRow--">clearCurrentRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#compareKeyForNextColumn-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-">compareKeyForNextColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#compareKeyForNextRow-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-">compareK
 eyForNextRow</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#createStartKeyFromRow-byte:A-org.apache.hadoop.hbase.regionserver.ScanInfo-">createStartKeyFromRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#currentRow--">currentRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getKeyForNextColumn-org.apache.hadoop.hbase.Cell-">getKeyForNextColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getStartKey--">getStartKey</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#instantiateDeleteTracker-org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost-">instantiateDeleteTracker</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#match-org.apache.hadoop.hba
 se.Cell-">match</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#preCheck-org.apache.hadoop.hbase.Cell-">preCheck</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#setToNewRow-org.apache.hadoop.hbase.Cell-">setToNewRow</a></code></li>
+<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#checkColumn-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-byte:A-int-int-long-byte-boolean-">checkColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#checkDeleted-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-org.apache.hadoop.hbase.Cell-">checkDeleted</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#clearCurrentRow--">clearCurrentRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#compareKeyForNextColumn-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-">compareKeyForNextColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#compareKeyForNextRow-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-">compareK
 eyForNextRow</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#createStartKeyFromRow-byte:A-org.apache.hadoop.hbase.regionserver.ScanInfo-">createStartKeyFromRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#currentRow--">currentRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getKeyForNextColumn-org.apache.hadoop.hbase.Cell-">getKeyForNextColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getStartKey--">getStartKey</a>,
 <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>,
 <a href="../../../../../../org/apache/hado
 
op/hbase/regionserver/querymatcher/ScanQueryMatcher.html#match-org.apache.hadoop.hbase.Cell-">match</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#preCheck-org.apache.hadoop.hbase.Cell-">preCheck</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#setToNewRow-org.apache.hadoop.hbase.Cell-">setToNewRow</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -305,7 +306,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>maxReadPointToTrackVersions</h4>
-<pre>protected final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.39">maxReadPointToTrackVersions</a></pre>
+<pre>protected final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.40">maxReadPointToTrackVersions</a></pre>
 <div class="block">readPoint over which the KVs are unconditionally 
included</div>
 </li>
 </ul>
@@ -315,7 +316,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>deletes</h4>
-<pre>protected final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.42">deletes</a></pre>
+<pre>protected final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.43">deletes</a></pre>
 <div class="block">Keeps track of deletes</div>
 </li>
 </ul>
@@ -325,7 +326,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockListLast">
 <li class="blockList">
 <h4>keepDeletedCells</h4>
-<pre>protected final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" 
title="enum in org.apache.hadoop.hbase">KeepDeletedCells</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.45">keepDeletedCells</a></pre>
+<pre>protected final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" 
title="enum in org.apache.hadoop.hbase">KeepDeletedCells</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.46">keepDeletedCells</a></pre>
 <div class="block">whether to return deleted rows</div>
 </li>
 </ul>
@@ -337,14 +338,15 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="CompactionScanQueryMatcher-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-long-long-long-">
+<a 
name="CompactionScanQueryMatcher-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-long-long-long-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CompactionScanQueryMatcher</h4>
-<pre>protected&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.47">CompactionScanQueryMatcher</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo,
+<pre>protected&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.48">CompactionScanQueryMatcher</a>(<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/DeleteTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker</a>&nbsp;deletes,
+                                     <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">ColumnTracker</a>&nbsp;columnTracker,
                                      long&nbsp;readPointToUse,
                                      long&nbsp;oldestUnexpiredTS,
                                      long&nbsp;now)</pre>
@@ -364,7 +366,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>beforeShipped</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.59">beforeShipped</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.58">beforeShipped</a>()
                    throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ShipperListener.html#beforeShipped--">ShipperListener</a></code></span></div>
 <div class="block">The action that needs to be performed before <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Shipper.html#shipped--"><code>Shipper.shipped()</code></a>
 is performed</div>
@@ -384,7 +386,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>hasNullColumnInQuery</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.65">hasNullColumnInQuery</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.64">hasNullColumnInQuery</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#hasNullColumnInQuery--">hasNullColumnInQuery</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher</a></code></dd>
@@ -399,7 +401,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>isUserScan</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.70">isUserScan</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.69">isUserScan</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#isUserScan--">isUserScan</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher</a></code></dd>
@@ -412,7 +414,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>moreRowsMayExistAfter</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.75">moreRowsMayExistAfter</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.74">moreRowsMayExistAfter</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#moreRowsMayExistAfter-org.apache.hadoop.hbase.Cell-">moreRowsMayExistAfter</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher</a></code></dd>
@@ -429,7 +431,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>getFilter</h4>
-<pre>public&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/filter/Filter.html" 
title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.80">getFilter</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/filter/Filter.html" 
title="class in org.apache.hadoop.hbase.filter">Filter</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.79">getFilter</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getFilter--">getFilter</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher</a></code></dd>
@@ -444,7 +446,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>getNextKeyHint</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" 
title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.86">getNextKeyHint</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" 
title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.85">getNextKeyHint</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)
                     throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getNextKeyHint-org.apache.hadoop.hbase.Cell-">ScanQueryMatcher</a></code></span></div>
 <div class="block">Delegate to <a 
href="../../../../../../org/apache/hadoop/hbase/filter/Filter.html#getNextCellHint-org.apache.hadoop.hbase.Cell-"><code>Filter.getNextCellHint(Cell)</code></a>.
 If no filter, return <code>null</code>.</div>
@@ -462,7 +464,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>reset</h4>
-<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.92">reset</a>()</pre>
+<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.91">reset</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#reset--">reset</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher</a></code></dd>
@@ -475,7 +477,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockList">
 <li class="blockList">
 <h4>trackDelete</h4>
-<pre>protected final&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.96">trackDelete</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
+<pre>protected final&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.95">trackDelete</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
 </li>
 </ul>
 <a 
name="create-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.ScanType-long-long-long-long-byte:A-byte:A-org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost-">
@@ -484,7 +486,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockListLast">
 <li class="blockList">
 <h4>create</h4>
-<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">CompactionScanQueryMatcher</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.108">create</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo,
+<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">CompactionScanQueryMatcher</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/CompactionScanQueryMatcher.html#line.107">create</a>(<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/ScanType.html" 
title="enum in org.apache.hadoop.hbase.regionserver">ScanType</a>&nbsp;scanType,
                                                 long&nbsp;readPointToUse,
                                                 long&nbsp;earliestPutTs,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html
index 3b6e0fb..7062019 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html
@@ -158,6 +158,9 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is
 <tr class="altColor">
 <td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html#VERSION_DELETED">VERSION_DELETED</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html#VERSION_MASKED">VERSION_MASKED</a></span></code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -254,12 +257,21 @@ the order they are declared.</div>
 <a name="NOT_DELETED">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>NOT_DELETED</h4>
 <pre>public static final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker.DeleteResult</a>
 <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html#line.99">NOT_DELETED</a></pre>
 </li>
 </ul>
+<a name="VERSION_MASKED">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>VERSION_MASKED</h4>
+<pre>public static final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker.DeleteResult</a>
 <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html#line.100">VERSION_MASKED</a></pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
@@ -274,7 +286,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/regionserver/querymatcher/DeleteTracker.DeleteResult.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker.DeleteResult</a>[]&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html#line.102">values</a>()</pre>
+<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker.DeleteResult</a>[]&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html#line.104">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:
@@ -294,7 +306,7 @@ for (DeleteTracker.DeleteResult c : 
DeleteTracker.DeleteResult.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker.DeleteResult</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html#line.102">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/regionserver/querymatcher/DeleteTracker.DeleteResult.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker.DeleteResult</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html#line.104">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/regionserver/querymatcher/DeleteTracker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.html
index cca6e9b..ab391e1 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.html
@@ -105,7 +105,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanDeleteTracker.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanDeleteTracker</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html"
 title="class in 
org.apache.hadoop.hbase.security.visibility">VisibilityScanDeleteTracker</a></dd>
+<dd><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/NewVersionBehaviorTracker.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">NewVersionBehaviorTracker</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanDeleteTracker.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanDeleteTracker</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.html"
 title="class in 
org.apache.hadoop.hbase.security.visibility">VisibilityNewVersionBehaivorTracker</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html"
 title="class in 
org.apache.hadoop.hbase.security.visibility">VisibilityScanDeleteTracker</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html
index 3736d4f..2880ea6 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html
@@ -209,8 +209,9 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html#DropDeletesCompactionScanQueryMatcher-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-long-long-long-long-">DropDeletesCompactionScanQueryMatcher</a></span>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo,
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html#DropDeletesCompactionScanQueryMatcher-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-long-long-long-long-">DropDeletesCompactionScanQueryMatcher</a></span>(<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/DeleteTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker</a>&nbsp;deletes,
+                                     <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">ColumnTracker</a>&nbsp;columns,
                                      long&nbsp;readPointToUse,
                                      long&nbsp;earliestPutTs,
                                      long&nbsp;oldestUnexpiredTS,
@@ -248,7 +249,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <!--   -->
 </a>
 <h3>Methods inherited from 
class&nbsp;org.apache.hadoop.hbase.regionserver.querymatcher.<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html"
 title="class in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher</a></h3>
-<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#checkColumn-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-byte:A-int-int-long-byte-boolean-">checkColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#checkDeleted-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-org.apache.hadoop.hbase.Cell-">checkDeleted</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#clearCurrentRow--">clearCurrentRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#compareKeyForNextColumn-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-">compareKeyForNextColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#compareKeyForNextRow-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-">compareK
 eyForNextRow</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#createStartKeyFromRow-byte:A-org.apache.hadoop.hbase.regionserver.ScanInfo-">createStartKeyFromRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#currentRow--">currentRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getKeyForNextColumn-org.apache.hadoop.hbase.Cell-">getKeyForNextColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getStartKey--">getStartKey</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#instantiateDeleteTracker-org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost-">instantiateDeleteTracker</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#match-org.apache.hadoop.hba
 se.Cell-">match</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#preCheck-org.apache.hadoop.hbase.Cell-">preCheck</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#setToNewRow-org.apache.hadoop.hbase.Cell-">setToNewRow</a></code></li>
+<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#checkColumn-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-byte:A-int-int-long-byte-boolean-">checkColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#checkDeleted-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-org.apache.hadoop.hbase.Cell-">checkDeleted</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#clearCurrentRow--">clearCurrentRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#compareKeyForNextColumn-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-">compareKeyForNextColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#compareKeyForNextRow-org.apache.hadoop.hbase.Cell-org.apache.hadoop.hbase.Cell-">compareK
 eyForNextRow</a>, <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#createStartKeyFromRow-byte:A-org.apache.hadoop.hbase.regionserver.ScanInfo-">createStartKeyFromRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#currentRow--">currentRow</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getKeyForNextColumn-org.apache.hadoop.hbase.Cell-">getKeyForNextColumn</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#getStartKey--">getStartKey</a>,
 <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>,
 <a href="../../../../../../org/apache/hado
 
op/hbase/regionserver/querymatcher/ScanQueryMatcher.html#match-org.apache.hadoop.hbase.Cell-">match</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#preCheck-org.apache.hadoop.hbase.Cell-">preCheck</a>,
 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.html#setToNewRow-org.apache.hadoop.hbase.Cell-">setToNewRow</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -313,7 +314,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="DropDeletesCompactionScanQueryMatcher-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-long-long-long-long-">
+<a 
name="DropDeletesCompactionScanQueryMatcher-org.apache.hadoop.hbase.regionserver.ScanInfo-org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker-org.apache.hadoop.hbase.regionserver.querymatcher.ColumnTracker-long-long-long-long-">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -321,6 +322,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <h4>DropDeletesCompactionScanQueryMatcher</h4>
 <pre>protected&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html#line.55">DropDeletesCompactionScanQueryMatcher</a>(<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/DeleteTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">DeleteTracker</a>&nbsp;deletes,
+                                                <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">ColumnTracker</a>&nbsp;columns,
                                                 long&nbsp;readPointToUse,
                                                 long&nbsp;earliestPutTs,
                                                 long&nbsp;oldestUnexpiredTS,
@@ -341,7 +343,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymat
 <ul class="blockListLast">
 <li class="blockList">
 <h4>tryDropDelete</h4>
-<pre>protected final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher.MatchCode</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html#line.62">tryDropDelete</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
+<pre>protected final&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver.querymatcher">ScanQueryMatcher.MatchCode</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html#line.63">tryDropDelete</a>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html
index cb53836..d117815 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html"
 title="class in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/LegacyScanQueryMatcher.html"
 title="class in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/IncludeAllCompactionQueryMatcher.html"
 title="class in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a 
href="../../../../../../index.html?org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html"
 target="_top">Frames</a></li>
@@ -508,7 +508,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/query
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html#checkVersions-org.apache.hadoop.hbase.Cell-long-byte-boolean-">checkVersions</a></code>&nbsp;in
 interface&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ColumnTracker.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.querymatcher">ColumnTracker</a></code></dd>
-<dd><code>timestamp</code> - The timeToLive to enforce.</dd>
+<dd><code>timestamp</code> - The timestamp of the cell.</dd>
 <dd><code>type</code> - the type of the key value (Put/Delete)</dd>
 <dd><code>ignoreCount</code> - indicates if the KV needs to be excluded while 
counting (used during
           compactions. We only count KV's that are older than all the 
scanners' read points.)</dd>
@@ -667,7 +667,7 @@ implements <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/query
 <div class="subNav">
 <ul class="navList">
 <li><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DropDeletesCompactionScanQueryMatcher.html"
 title="class in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/LegacyScanQueryMatcher.html"
 title="class in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/IncludeAllCompactionQueryMatcher.html"
 title="class in org.apache.hadoop.hbase.regionserver.querymatcher"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a 
href="../../../../../../index.html?org/apache/hadoop/hbase/regionserver/querymatcher/ExplicitColumnTracker.html"
 target="_top">Frames</a></li>

Reply via email to