http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
 
b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
index c040fbb..cf72bd9 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultDecodingContext.html
@@ -109,35 +109,35 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span 
class="strong">FastDiffDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colLast"><span 
class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span 
class="strong">DiffKeyDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colLast"><span 
class="strong">FastDiffDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span 
class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colFirst"><code>protected abstract <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a></code></td>
+<td class="colLast"><span 
class="strong">BufferedDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected abstract <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span 
class="strong">BufferedDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a></code></td>
+<td class="colLast"><span 
class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="http://docs.oracle.com/javase/7/docs/api/java/nio/ByteBuffer.html?is-external=true";
 title="class or interface in java.nio">ByteBuffer</a></code></td>
-<td class="colLast"><span 
class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
+<td class="colLast"><span 
class="strong">DiffKeyDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#internalDecodeKeyValues(java.io.DataInputStream,%20int,%20int,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultDecodingContext)">internalDecodeKeyValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html?is-external=true";
 title="class or interface in java.io">DataInputStream</a>&nbsp;source,
                                               int&nbsp;allocateHeaderLength,
                                               int&nbsp;skipLastBytes,
                                               <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultDecodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultDecodingContext</a>&nbsp;decodingCtx)</code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
 
b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
index e989ff4..974369a 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/encoding/class-use/HFileBlockDefaultEncodingContext.html
@@ -109,34 +109,34 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><span 
class="strong">FastDiffDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</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">CopyKeyDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface 
in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                             <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
                             <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in 
java.io">DataOutputStream</a>&nbsp;out)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>int</code></td>
-<td class="colLast"><span 
class="strong">DiffKeyDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</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">FastDiffDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/FastDiffDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface 
in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                             <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
                             <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in 
java.io">DataOutputStream</a>&nbsp;out)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><span 
class="strong">CopyKeyDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/CopyKeyDataBlockEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface 
in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
-                            <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
-                            <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in 
java.io">DataOutputStream</a>&nbsp;out)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>abstract int</code></td>
 <td class="colLast"><span 
class="strong">BufferedDataBlockEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface 
in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                             <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingCtx,
                             <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in 
java.io">DataOutputStream</a>&nbsp;out)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><span 
class="strong">PrefixKeyDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/PrefixKeyDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface 
in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
                             <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
                             <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in 
java.io">DataOutputStream</a>&nbsp;out)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><span 
class="strong">DiffKeyDeltaEncoder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DiffKeyDeltaEncoder.html#internalEncode(org.apache.hadoop.hbase.Cell,%20org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext,%20java.io.DataOutputStream)">internalEncode</a></strong>(<a
 href="../../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface 
in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
+                            <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.html"
 title="class in 
org.apache.hadoop.hbase.io.encoding">HFileBlockDefaultEncodingContext</a>&nbsp;encodingContext,
+                            <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html?is-external=true";
 title="class or interface in 
java.io">DataOutputStream</a>&nbsp;out)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockPriority.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockPriority.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockPriority.html
index a50dd6c..1b9e63d 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockPriority.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockPriority.html
@@ -239,7 +239,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/io/hfile/BlockPriority.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockPriority</a>[]&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/BlockPriority.html#line.33">values</a>()</pre>
+<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockPriority</a>[]&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/BlockPriority.html#line.32">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:
@@ -256,7 +256,7 @@ for (BlockPriority c : BlockPriority.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockPriority</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/BlockPriority.html#line.33">valueOf</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockPriority</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/BlockPriority.html#line.32">valueOf</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&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/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockType.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockType.html
index 1d04a69..2838e37 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockType.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/BlockType.html
@@ -524,7 +524,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/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a>[]&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/BlockType.html#line.37">values</a>()</pre>
+<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a>[]&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/BlockType.html#line.26">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:
@@ -541,7 +541,7 @@ for (BlockType c : BlockType.values())
 <ul class="blockList">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/BlockType.html#line.37">valueOf</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/BlockType.html#line.26">valueOf</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&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/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html
index 94e60c9..c6a934b 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html
@@ -226,7 +226,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/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a>[]&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html#line.42">values</a>()</pre>
+<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a>[]&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html#line.28">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:
@@ -243,7 +243,7 @@ for (Cacheable.MemoryType c : Cacheable.MemoryType.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html#line.42">valueOf</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html#line.28">valueOf</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&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/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html
index fc8fa85..e3a17a7 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCache.html
@@ -219,15 +219,15 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]</code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlockCaches()">getBlockCaches</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">BlockCache</a>[]</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
index be73c6b..090b827 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockCacheKey.html
@@ -160,23 +160,23 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>
 <div class="block">Add block to cache (defaults to not in-memory).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>
 <div class="block">Cache the block with the specified name and buffer.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                    <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf)</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span 
class="strong">MemcachedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
@@ -184,32 +184,32 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>
-<div class="block">Add block to cache.</div>
-</td>
+                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
                     boolean&nbsp;cacheDataInL1)</code>
-<div class="block">Cache the block with the specified name and buffer.</div>
+<div class="block">Add block to cache.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
-                    boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
+                    boolean&nbsp;cacheDataInL1)</code>
+<div class="block">Cache the block with the specified name and buffer.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#cacheBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable,%20boolean,%20boolean)">cacheBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                     <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;buf,
                     boolean&nbsp;inMemory,
                     boolean&nbsp;cacheDataInL1)</code>&nbsp;</td>
@@ -229,17 +229,17 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>
-<div class="block">Evict block from cache.</div>
-</td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>
+<div class="block">Evict block from cache.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>&nbsp;</td>
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#evictBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey)">evictBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
@@ -247,32 +247,32 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>
-<div class="block">Fetch block from cache.</div>
-</td>
+                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
                 boolean&nbsp;updateCacheMetrics)</code>
-<div class="block">Get the buffer of the block with the specified name.</div>
+<div class="block">Fetch block from cache.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
-                boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
+                boolean&nbsp;updateCacheMetrics)</code>
+<div class="block">Get the buffer of the block with the specified name.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a></code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span 
class="strong">InclusiveCombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InclusiveCombinedBlockCache.html#getBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20boolean,%20boolean,%20boolean)">getBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                 boolean&nbsp;caching,
                 boolean&nbsp;repeat,
                 boolean&nbsp;updateCacheMetrics)</code>&nbsp;</td>
@@ -302,20 +302,20 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                       <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>
 <div class="block">Called when the scanner using the block decides to return 
the block once its usage
  is over.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
-                      <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
+<td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#returnBlock(org.apache.hadoop.hbase.io.hfile.BlockCacheKey,%20org.apache.hadoop.hbase.io.hfile.Cacheable)">returnBlock</a></strong>(<a
 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html" 
title="class in 
org.apache.hadoop.hbase.io.hfile">BlockCacheKey</a>&nbsp;cacheKey,
                       <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" 
title="interface in 
org.apache.hadoop.hbase.io.hfile">Cacheable</a>&nbsp;block)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
index 58b6077..a83a9f9 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html
@@ -161,20 +161,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
+<td class="colLast"><span class="strong">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#blockType">blockType</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
 <td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#blockType">blockType</a></strong></code>
 <div class="block">Type of block.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
 <td class="colLast"><span 
class="strong">HFileBlock.Writer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.html#blockType">blockType</a></strong></code>
 <div class="block">Current block type.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#blockType">blockType</a></strong></code>&nbsp;</td>
-</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">
@@ -186,39 +186,39 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlock.BlockWritable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.BlockWritable.html#getBlockType()">getBlockType</a></strong>()</code>
-<div class="block">The type of block this data should use.</div>
-</td>
+<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">CachedBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">CachedBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CachedBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span class="strong">BlockCacheKey.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheKey.html#getBlockType()">getBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlock.BlockWritable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.BlockWritable.html#getBlockType()">getBlockType</a></strong>()</code>
+<div class="block">The type of block this data should use.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">InlineBlockWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>
-<div class="block">The type of blocks this block writer produces.</div>
-</td>
+<td class="colLast"><span 
class="strong">CompoundBloomFilterWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">InlineBlockWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/InlineBlockWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>
+<div class="block">The type of blocks this block writer produces.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
-<td class="colLast"><span 
class="strong">CompoundBloomFilterWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CompoundBloomFilterWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#getInlineBlockType()">getInlineBlockType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in org.apache.hadoop.hbase.io.hfile">BlockType</a></code></td>
@@ -347,27 +347,27 @@ the order they are declared.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileBlock</a></code></td>
-<td class="colLast"><span 
class="strong">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;offset,
+<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;dataBlockOffset,
                   long&nbsp;onDiskBlockSize,
                   boolean&nbsp;cacheBlock,
                   boolean&nbsp;pread,
                   boolean&nbsp;isCompaction,
                   boolean&nbsp;updateCacheMetrics,
                   <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;expectedBlockType,
-                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>
-<div class="block">Read in a file block.</div>
-</td>
+                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html" 
title="class in org.apache.hadoop.hbase.io.hfile">HFileBlock</a></code></td>
-<td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;dataBlockOffset,
+<td class="colLast"><span 
class="strong">HFile.CachingBlockReader.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.CachingBlockReader.html#readBlock(long,%20long,%20boolean,%20boolean,%20boolean,%20boolean,%20org.apache.hadoop.hbase.io.hfile.BlockType,%20org.apache.hadoop.hbase.io.encoding.DataBlockEncoding)">readBlock</a></strong>(long&nbsp;offset,
                   long&nbsp;onDiskBlockSize,
                   boolean&nbsp;cacheBlock,
                   boolean&nbsp;pread,
                   boolean&nbsp;isCompaction,
                   boolean&nbsp;updateCacheMetrics,
                   <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" 
title="enum in 
org.apache.hadoop.hbase.io.hfile">BlockType</a>&nbsp;expectedBlockType,
-                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>&nbsp;</td>
+                  <a 
href="../../../../../../../org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.html"
 title="enum in 
org.apache.hadoop.hbase.io.encoding">DataBlockEncoding</a>&nbsp;expectedDataBlockEncoding)</code>
+<div class="block">Read in a file block.</div>
+</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private void</code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
index 942f413..28e2743 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheConfig.html
@@ -232,20 +232,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">HFile.WriterFactory.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.WriterFactory.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">HFileWriterImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html#cacheConf">cacheConf</a></strong></code>
 <div class="block">Cache configuration for caching data on write.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">HFileReaderImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html#cacheConf">cacheConf</a></strong></code>
 <div class="block">Block cache configuration.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span 
class="strong">HFile.WriterFactory.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFile.WriterFactory.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">HFileBlockIndex.BlockIndexWriter.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.BlockIndexWriter.html#cacheConf">cacheConf</a></strong></code>
@@ -534,15 +534,15 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">SweepReducer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">MemStoreWrapper.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">MemStoreWrapper.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">SweepJob.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">SweepJob.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepJob.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span class="strong">SweepReducer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -575,17 +575,17 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span class="strong">StoreFile.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span 
class="strong">StoreFile.WriterBuilder.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.WriterBuilder.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#cacheConf">cacheConf</a></strong></code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
@@ -605,18 +605,18 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span class="strong">Store.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCacheConfig()">getCacheConfig</a></strong>()</code>
 <div class="block">Used for tests.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
 <td class="colLast"><span class="strong">HRegionServer.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#getCacheConfig()">getCacheConfig</a></strong>()</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing 
methods, and an explanation">
@@ -727,11 +727,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">BlockCacheViewTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>
-<td class="colLast"><span 
class="strong">BlockCacheTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
+<td class="colLast"><span 
class="strong">BlockCacheViewTmplImpl.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmplImpl.html#cacheConfig">cacheConfig</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a></code></td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
index 7dfafa9..4143193 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheStats.html
@@ -150,20 +150,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
+<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getStats()">getStats</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
 <td class="colLast"><span class="strong">BlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCache.html#getStats()">getStats</a></strong>()</code>
 <div class="block">Get the statistics for this block cache.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
 <td class="colLast"><span class="strong">LruBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/LruBlockCache.html#getStats()">getStats</a></strong>()</code>
 <div class="block">Get counter statistics for this cache.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
-<td class="colLast"><span 
class="strong">CombinedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.html#getStats()">getStats</a></strong>()</code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheStats.html" 
title="class in org.apache.hadoop.hbase.io.hfile">CacheStats</a></code></td>
 <td class="colLast"><span 
class="strong">MemcachedBlockCache.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/MemcachedBlockCache.html#getStats()">getStats</a></strong>()</code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31709f2f/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
index 0016eec..29cfaa9 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html
@@ -112,11 +112,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a></code></td>
-<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getMemoryType()">getMemoryType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getMemoryType()">getMemoryType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a></code></td>
-<td class="colLast"><span class="strong">Cacheable.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html#getMemoryType()">getMemoryType</a></strong>()</code>&nbsp;</td>
+<td class="colLast"><span class="strong">HFileBlock.</span><code><strong><a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.html#getMemoryType()">getMemoryType</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html"
 title="enum in 
org.apache.hadoop.hbase.io.hfile">Cacheable.MemoryType</a></code></td>

Reply via email to