http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html
index fc727b2..c7de363 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/KeyValueScanner.html
@@ -465,18 +465,18 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanner(org.apache.hadoop.hbase.client.Scan,%20java.util.NavigableSet,%20long)">getScanner</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
-                    <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/NavigableSet.html?is-external=true";
 title="class or interface in 
java.util">NavigableSet</a>&lt;byte[]&gt;&nbsp;targetCols,
-                    long&nbsp;readPt)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a></code></td>
 <td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanner(org.apache.hadoop.hbase.client.Scan,%20java.util.NavigableSet,%20long)">getScanner</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
                     <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/NavigableSet.html?is-external=true";
 title="class or interface in 
java.util">NavigableSet</a>&lt;byte[]&gt;&nbsp;targetCols,
                     long&nbsp;readPt)</code>
 <div class="block">Return a scanner for both the memstore and the HStore 
files.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a></code></td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanner(org.apache.hadoop.hbase.client.Scan,%20java.util.NavigableSet,%20long)">getScanner</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class 
in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
+                    <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/NavigableSet.html?is-external=true";
 title="class or interface in 
java.util">NavigableSet</a>&lt;byte[]&gt;&nbsp;targetCols,
+                    long&nbsp;readPt)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a></code></td>
 <td class="colLast"><span class="strong">KeyValueHeap.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueHeap.html#pollRealKV()">pollRealKV</a></strong>()</code>
@@ -515,7 +515,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;</code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanners(boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.regionserver.ScanQueryMatcher,%20byte[],%20byte[],%20long)">getScanners</a></strong>(boolean&nbsp;cacheBlocks,
+<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanners(boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.regionserver.ScanQueryMatcher,%20byte[],%20byte[],%20long)">getScanners</a></strong>(boolean&nbsp;cacheBlocks,
                       boolean&nbsp;isGet,
                       boolean&nbsp;usePread,
                       boolean&nbsp;isCompaction,
@@ -529,7 +529,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;</code></td>
-<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanners(boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.regionserver.ScanQueryMatcher,%20byte[],%20byte[],%20long)">getScanners</a></strong>(boolean&nbsp;cacheBlocks,
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanners(boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.regionserver.ScanQueryMatcher,%20byte[],%20byte[],%20long)">getScanners</a></strong>(boolean&nbsp;cacheBlocks,
                       boolean&nbsp;isGet,
                       boolean&nbsp;usePread,
                       boolean&nbsp;isCompaction,
@@ -543,7 +543,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;</code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanners(java.util.List,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.regionserver.ScanQueryMatcher,%20byte[],%20byte[],%20long,%20boolean)">getScanners</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;files,
+<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanners(java.util.List,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.regionserver.ScanQueryMatcher,%20byte[],%20byte[],%20long,%20boolean)">getScanners</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;files,
                       boolean&nbsp;cacheBlocks,
                       boolean&nbsp;isGet,
                       boolean&nbsp;usePread,
@@ -552,11 +552,14 @@
                       byte[]&nbsp;startRow,
                       byte[]&nbsp;stopRow,
                       long&nbsp;readPt,
-                      boolean&nbsp;includeMemstoreScanner)</code>&nbsp;</td>
+                      boolean&nbsp;includeMemstoreScanner)</code>
+<div class="block">Create scanners on the given files and if needed on the 
memstore with no filtering based on TTL
+ (that happens further down the line).</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;</code></td>
-<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanners(java.util.List,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.regionserver.ScanQueryMatcher,%20byte[],%20byte[],%20long,%20boolean)">getScanners</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;files,
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanners(java.util.List,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.regionserver.ScanQueryMatcher,%20byte[],%20byte[],%20long,%20boolean)">getScanners</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" 
title="class in 
org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;files,
                       boolean&nbsp;cacheBlocks,
                       boolean&nbsp;isGet,
                       boolean&nbsp;usePread,
@@ -565,18 +568,15 @@
                       byte[]&nbsp;startRow,
                       byte[]&nbsp;stopRow,
                       long&nbsp;readPt,
-                      boolean&nbsp;includeMemstoreScanner)</code>
-<div class="block">Create scanners on the given files and if needed on the 
memstore with no filtering based on TTL
- (that happens further down the line).</div>
-</td>
+                      boolean&nbsp;includeMemstoreScanner)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">AbstractMemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/AbstractMemStore.html#getScanners(long)">getScanners</a></strong>(long&nbsp;readPt)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">MemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStore.html#getScanners(long)">getScanners</a></strong>(long&nbsp;readPt)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;</code></td>
-<td class="colLast"><span class="strong">MemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStore.html#getScanners(long)">getScanners</a></strong>(long&nbsp;readPt)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">AbstractMemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/AbstractMemStore.html#getScanners(long)">getScanners</a></strong>(long&nbsp;readPt)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;</code></td>
@@ -602,12 +602,12 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><span 
class="strong">KeyValueHeap.KVScannerComparator.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html#compare(org.apache.hadoop.hbase.regionserver.KeyValueScanner,%20org.apache.hadoop.hbase.regionserver.KeyValueScanner)">compare</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;left,
+<td class="colLast"><span 
class="strong">ReversedKeyValueHeap.ReversedKVScannerComparator.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ReversedKeyValueHeap.ReversedKVScannerComparator.html#compare(org.apache.hadoop.hbase.regionserver.KeyValueScanner,%20org.apache.hadoop.hbase.regionserver.KeyValueScanner)">compare</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;left,
               <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;right)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><span 
class="strong">ReversedKeyValueHeap.ReversedKVScannerComparator.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ReversedKeyValueHeap.ReversedKVScannerComparator.html#compare(org.apache.hadoop.hbase.regionserver.KeyValueScanner,%20org.apache.hadoop.hbase.regionserver.KeyValueScanner)">compare</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;left,
+<td class="colLast"><span 
class="strong">KeyValueHeap.KVScannerComparator.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html#compare(org.apache.hadoop.hbase.regionserver.KeyValueScanner,%20org.apache.hadoop.hbase.regionserver.KeyValueScanner)">compare</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;left,
               <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;right)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
index 58259f2..136377b 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
@@ -170,26 +170,26 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a></code></td>
-<td class="colLast"><span 
class="strong">AbstractMemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/AbstractMemStore.html#snapshot()">snapshot</a></strong>()</code>
-<div class="block">An override on snapshot so the no arg version of the method 
implies zero seq num,
- like for cases without wal</div>
+<td class="colLast"><span class="strong">MemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStore.html#snapshot()">snapshot</a></strong>()</code>
+<div class="block">Creates a snapshot of the current memstore.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a></code></td>
-<td class="colLast"><span class="strong">MemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStore.html#snapshot()">snapshot</a></strong>()</code>
-<div class="block">Creates a snapshot of the current memstore.</div>
+<td class="colLast"><span 
class="strong">AbstractMemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/AbstractMemStore.html#snapshot()">snapshot</a></strong>()</code>
+<div class="block">An override on snapshot so the no arg version of the method 
implies zero seq num,
+ like for cases without wal</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a></code></td>
-<td class="colLast"><span 
class="strong">DefaultMemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/DefaultMemStore.html#snapshot(long)">snapshot</a></strong>(long&nbsp;flushOpSeqId)</code>
+<td class="colLast"><span class="strong">MemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStore.html#snapshot(long)">snapshot</a></strong>(long&nbsp;flushOpSeqId)</code>
 <div class="block">Creates a snapshot of the current memstore.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a></code></td>
-<td class="colLast"><span class="strong">MemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStore.html#snapshot(long)">snapshot</a></strong>(long&nbsp;flushOpSeqId)</code>
+<td class="colLast"><span 
class="strong">DefaultMemStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/DefaultMemStore.html#snapshot(long)">snapshot</a></strong>(long&nbsp;flushOpSeqId)</code>
 <div class="block">Creates a snapshot of the current memstore.</div>
 </td>
 </tr>
@@ -212,13 +212,6 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;</code></td>
-<td class="colLast"><span 
class="strong">DefaultStoreFlusher.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a>&nbsp;snapshot,
-                          long&nbsp;cacheFlushId,
-                          <a 
href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" 
title="interface in 
org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
-                          <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>abstract <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;</code></td>
 <td class="colLast"><span class="strong">StoreFlusher.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a>&nbsp;snapshot,
                           long&nbsp;cacheFlushSeqNum,
@@ -227,13 +220,20 @@
 <div class="block">Turns a snapshot of memstore into a set of store 
files.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;</code></td>
 <td class="colLast"><span 
class="strong">StripeStoreFlusher.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a>&nbsp;snapshot,
                           long&nbsp;cacheFlushSeqNum,
                           <a 
href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" 
title="interface in 
org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
                           <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;</code></td>
+<td class="colLast"><span 
class="strong">DefaultStoreFlusher.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a>&nbsp;snapshot,
+                          long&nbsp;cacheFlushId,
+                          <a 
href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" 
title="interface in 
org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
+                          <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/OperationStatus.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/OperationStatus.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/OperationStatus.html
index e836afd..106ed46 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/OperationStatus.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/OperationStatus.html
@@ -228,38 +228,38 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/OperationStatus.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">OperationStatus</a>[]</code></td>
-<td class="colLast"><span 
class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#addLabels(java.util.List)">addLabels</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;labels)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/OperationStatus.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">OperationStatus</a>[]</code></td>
 <td class="colLast"><span 
class="strong">VisibilityLabelService.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.html#addLabels(java.util.List)">addLabels</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;labels)</code>
 <div class="block">Adds the set of labels into the system.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/OperationStatus.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">OperationStatus</a>[]</code></td>
-<td class="colLast"><span 
class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#clearAuths(byte[],%20java.util.List)">clearAuths</a></strong>(byte[]&nbsp;user,
-                    <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;authLabels)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#addLabels(java.util.List)">addLabels</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;labels)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/OperationStatus.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">OperationStatus</a>[]</code></td>
 <td class="colLast"><span 
class="strong">VisibilityLabelService.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.html#clearAuths(byte[],%20java.util.List)">clearAuths</a></strong>(byte[]&nbsp;user,
                     <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;authLabels)</code>
 <div class="block">Removes given labels from user's globally authorized list 
of labels.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/OperationStatus.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">OperationStatus</a>[]</code></td>
-<td class="colLast"><span 
class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#setAuths(byte[],%20java.util.List)">setAuths</a></strong>(byte[]&nbsp;user,
-                <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;authLabels)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#clearAuths(byte[],%20java.util.List)">clearAuths</a></strong>(byte[]&nbsp;user,
+                    <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;authLabels)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/OperationStatus.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">OperationStatus</a>[]</code></td>
 <td class="colLast"><span 
class="strong">VisibilityLabelService.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.html#setAuths(byte[],%20java.util.List)">setAuths</a></strong>(byte[]&nbsp;user,
                 <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;authLabels)</code>
 <div class="block">Sets given labels globally authorized for the user.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/OperationStatus.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">OperationStatus</a>[]</code></td>
+<td class="colLast"><span 
class="strong">DefaultVisibilityLabelServiceImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.html#setAuths(byte[],%20java.util.List)">setAuths</a></strong>(byte[]&nbsp;user,
+                <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
 title="class or interface in 
java.util">List</a>&lt;byte[]&gt;&nbsp;authLabels)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Region.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Region.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Region.html
index 4afbb67..86b7c58 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Region.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Region.html
@@ -759,16 +759,16 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="strong">HeapMemoryManager.HeapMemoryTunerChore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTunerChore.html#flushRequested(org.apache.hadoop.hbase.regionserver.FlushType,%20org.apache.hadoop.hbase.regionserver.Region)">flushRequested</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" 
title="enum in org.apache.hadoop.hbase.regionserver">FlushType</a>&nbsp;type,
+                            <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;region)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="strong">FlushRequestListener.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/FlushRequestListener.html#flushRequested(org.apache.hadoop.hbase.regionserver.FlushType,%20org.apache.hadoop.hbase.regionserver.Region)">flushRequested</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" 
title="enum in org.apache.hadoop.hbase.regionserver">FlushType</a>&nbsp;type,
                             <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;region)</code>
 <div class="block">Callback which will get called when a flush request is made 
for a region.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">HeapMemoryManager.HeapMemoryTunerChore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTunerChore.html#flushRequested(org.apache.hadoop.hbase.regionserver.FlushType,%20org.apache.hadoop.hbase.regionserver.Region)">flushRequested</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" 
title="enum in org.apache.hadoop.hbase.regionserver">FlushType</a>&nbsp;type,
-                            <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;region)</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) <a 
href="../../../../../../org/apache/hadoop/hbase/wal/WAL.html" title="interface 
in org.apache.hadoop.hbase.wal">WAL</a></code></td>
 <td class="colLast"><span class="strong">RSRpcServices.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RSRpcServices.html#getWAL(org.apache.hadoop.hbase.regionserver.Region)">getWAL</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&nbsp;region)</code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionCoprocessorHost.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionCoprocessorHost.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionCoprocessorHost.html
index c30a7c7..00a9484 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionCoprocessorHost.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionCoprocessorHost.html
@@ -117,7 +117,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">RegionCoprocessorHost</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCoprocessorHost()">getCoprocessorHost</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCoprocessorHost()">getCoprocessorHost</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">RegionCoprocessorHost</a></code></td>
@@ -125,11 +125,11 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">RegionCoprocessorHost</a></code></td>
-<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCoprocessorHost()">getCoprocessorHost</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getCoprocessorHost()">getCoprocessorHost</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html"
 title="class in 
org.apache.hadoop.hbase.regionserver">RegionCoprocessorHost</a></code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getCoprocessorHost()">getCoprocessorHost</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCoprocessorHost()">getCoprocessorHost</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
index 8b6c304..656c703 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
@@ -179,13 +179,13 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionServerCoprocessorEnvironment.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/coprocessor/RegionServerCoprocessorEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
-<div class="block">Gets the region server services.</div>
-</td>
+<td class="colLast"><span 
class="strong">RegionCoprocessorEnvironment.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionCoprocessorEnvironment.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionServerCoprocessorEnvironment.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/coprocessor/RegionServerCoprocessorEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
+<div class="block">Gets the region server services.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -336,37 +336,37 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">CompactedHFilesDischarger.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.html#regionServerServices">regionServerServices</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionServerCoprocessorHost.RegionServerEnvironment.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.RegionServerEnvironment.html#regionServerServices">regionServerServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionServerCoprocessorHost.RegionServerEnvironment.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.RegionServerEnvironment.html#regionServerServices">regionServerServices</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">CompactedHFilesDischarger.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactedHFilesDischarger.html#regionServerServices">regionServerServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
 <td class="colLast"><span 
class="strong">RegionMergeTransactionImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>(package private) <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionCoprocessorHost.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html#rsServices">rsServices</a></strong></code>
-<div class="block">The region server services</div>
-</td>
+<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionCoprocessorHost.RegionEnvironment.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.RegionEnvironment.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colFirst"><code>(package private) <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionServerCoprocessorHost.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionCoprocessorHost.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html#rsServices">rsServices</a></strong></code>
+<div class="block">The region server services</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionServerCoprocessorHost.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionCoprocessorHost.RegionEnvironment.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.RegionEnvironment.html#rsServices">rsServices</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
@@ -391,31 +391,31 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionCoprocessorHost.RegionEnvironment.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.RegionEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">SplitTransactionImpl.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colFirst"><code>(package private) <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
-<div class="block">Get the RegonServerServices of the server running the 
transaction or rollback</div>
-</td>
+<td class="colLast"><span 
class="strong">RegionServerCoprocessorHost.RegionServerEnvironment.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.RegionServerEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
+<td class="colLast"><span 
class="strong">RegionCoprocessorHost.RegionEnvironment.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.RegionEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
 <td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
 <div class="block">Get the RegonServerServices of the server running the 
transaction or rollback</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>(package private) <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a></code></td>
-<td class="colLast"><span 
class="strong">RegionServerCoprocessorHost.RegionServerEnvironment.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.RegionServerEnvironment.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#getRegionServerServices()">getRegionServerServices</a></strong>()</code>
+<div class="block">Get the RegonServerServices of the server running the 
transaction or rollback</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -462,20 +462,20 @@
               <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #execute(Server, RegionServerServices, 
User)</i></div>
+<div class="block"><i>use #execute(Server, RegionServerServices, User);  as of 
1.0.2, remove in 3.0</i></div>
 </div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">execute</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #execute(Server, RegionServerServices, User);  as of 
1.0.2, remove in 3.0</i></div>
+<div class="block"><i>use #execute(Server, RegionServerServices, 
User)</i></div>
 </div>
 </td>
 </tr>
@@ -492,16 +492,16 @@
               <a 
href="../../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in 
org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
               <a 
href="../../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Run the transaction.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/util/PairOfSameType.html" 
title="class in org.apache.hadoop.hbase.util">PairOfSameType</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in 
org.apache.hadoop.hbase.regionserver">Region</a>&gt;</code></td>
-<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.html" 
title="interface in org.apache.hadoop.hbase.regionserver">Region</a></code></td>
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#execute(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">execute</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
               <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
               <a 
href="../../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Run the transaction.</div>
@@ -616,19 +616,19 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #rollback(Server, RegionServerServices, 
User)</i></div>
+<div class="block"><i>use #rollback(Server, RegionServerServices, User); as of 
1.0.2, remove in 3.0</i></div>
 </div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices)">rollback</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>use #rollback(Server, RegionServerServices, User); as of 
1.0.2, remove in 3.0</i></div>
+<div class="block"><i>use #rollback(Server, RegionServerServices, 
User)</i></div>
 </div>
 </td>
 </tr>
@@ -646,7 +646,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                 <a 
href="../../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Roll back a failed transaction</div>
@@ -654,7 +654,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">SplitTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">RegionMergeTransaction.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.html#rollback(org.apache.hadoop.hbase.Server,%20org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.hbase.security.User)">rollback</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Server.html" title="interface 
in org.apache.hadoop.hbase">Server</a>&nbsp;server,
                 <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;services,
                 <a 
href="../../../../../../org/apache/hadoop/hbase/security/User.html" 
title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>
 <div class="block">Roll back a failed transaction</div>
@@ -941,35 +941,35 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a></code></td>
-<td class="colLast"><span 
class="strong">FlushThroughputControllerFactory.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/FlushThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">CompactionThroughputControllerFactory.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/CompactionThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
             org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a></code></td>
-<td class="colLast"><span 
class="strong">CompactionThroughputControllerFactory.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/CompactionThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
+<td class="colLast"><span 
class="strong">FlushThroughputControllerFactory.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/FlushThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
             org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">PressureAwareCompactionThroughputController.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">ThroughputController.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>
+<div class="block">Setup controller for the given region server.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="strong">PressureAwareFlushThroughputController.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareFlushThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">NoLimitThroughputController.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/NoLimitThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>abstract void</code></td>
 <td class="colLast"><span 
class="strong">PressureAwareThroughputController.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="strong">NoLimitThroughputController.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/NoLimitThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">ThroughputController.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>
-<div class="block">Setup controller for the given region server.</div>
-</td>
+<td class="colLast"><span 
class="strong">PressureAwareCompactionThroughputController.</span><code><strong><a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a
 
href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html"
 title="interface in 
org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html
index 7ae070b..ea0acde 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanInfo.html
@@ -132,11 +132,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanInfo()">getScanInfo</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanInfo()">getScanInfo</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" 
title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a></code></td>
-<td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getScanInfo()">getScanInfo</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getScanInfo()">getScanInfo</a></strong>()</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
index f85c7d3..8035f5b 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/ScanQueryMatcher.MatchCode.html
@@ -96,7 +96,7 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span 
class="strong">ExplicitColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#checkColumn(org.apache.hadoop.hbase.Cell,%20byte)">checkColumn</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+<td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#checkColumn(org.apache.hadoop.hbase.Cell,%20byte)">checkColumn</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                       byte&nbsp;type)</code>
 <div class="block">Checks if the column is present in the list of requested 
columns by returning the match code
  instance.</div>
@@ -104,7 +104,7 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#checkColumn(org.apache.hadoop.hbase.Cell,%20byte)">checkColumn</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+<td class="colLast"><span 
class="strong">ExplicitColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#checkColumn(org.apache.hadoop.hbase.Cell,%20byte)">checkColumn</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                       byte&nbsp;type)</code>
 <div class="block">Checks if the column is present in the list of requested 
columns by returning the match code
  instance.</div>
@@ -137,13 +137,6 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span 
class="strong">ExplicitColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#checkVersions(org.apache.hadoop.hbase.Cell,%20long,%20byte,%20boolean)">checkVersions</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
-                          long&nbsp;timestamp,
-                          byte&nbsp;type,
-                          boolean&nbsp;ignoreCount)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
 <td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#checkVersions(org.apache.hadoop.hbase.Cell,%20long,%20byte,%20boolean)">checkVersions</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                           long&nbsp;ttl,
                           byte&nbsp;type,
@@ -151,6 +144,13 @@
 <div class="block">Keeps track of the number of versions for the columns asked 
for.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
+<td class="colLast"><span 
class="strong">ExplicitColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#checkVersions(org.apache.hadoop.hbase.Cell,%20long,%20byte,%20boolean)">checkVersions</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+                          long&nbsp;timestamp,
+                          byte&nbsp;type,
+                          boolean&nbsp;ignoreCount)</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
 <td class="colLast"><span 
class="strong">ScanWildcardColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanWildcardColumnTracker.html#checkVersions(org.apache.hadoop.hbase.Cell,%20long,%20byte,%20boolean)">checkVersions</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
@@ -162,14 +162,14 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
-<td class="colLast"><span 
class="strong">ExplicitColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#getNextRowOrNextColumn(org.apache.hadoop.hbase.Cell)">getNextRowOrNextColumn</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
 <td class="colLast"><span class="strong">ColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ColumnTracker.html#getNextRowOrNextColumn(org.apache.hadoop.hbase.Cell)">getNextRowOrNextColumn</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</code>
 <div class="block">Retrieve the MatchCode for the next row or column</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
+<td class="colLast"><span 
class="strong">ExplicitColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.html#getNextRowOrNextColumn(org.apache.hadoop.hbase.Cell)">getNextRowOrNextColumn</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html"
 title="enum in 
org.apache.hadoop.hbase.regionserver">ScanQueryMatcher.MatchCode</a></code></td>
 <td class="colLast"><span 
class="strong">ScanWildcardColumnTracker.</span><code><strong><a 
href="../../../../../../org/apache/hadoop/hbase/regionserver/ScanWildcardColumnTracker.html#getNextRowOrNextColumn(org.apache.hadoop.hbase.Cell)">getNextRowOrNextColumn</a></strong>(<a
 href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in 
org.apache.hadoop.hbase">Cell</a>&nbsp;cell)</code>&nbsp;</td>

Reply via email to