http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5f066b2e/apache_hbase_reference_guide.pdfmarks
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdfmarks 
b/apache_hbase_reference_guide.pdfmarks
index 8c8d5c1..96c8c78 100644
--- a/apache_hbase_reference_guide.pdfmarks
+++ b/apache_hbase_reference_guide.pdfmarks
@@ -2,8 +2,8 @@
   /Author (Apache HBase Team)
   /Subject ()
   /Keywords ()
-  /ModDate (D:20160714144918)
-  /CreationDate (D:20160714144918)
+  /ModDate (D:20160717144500)
+  /CreationDate (D:20160717144500)
   /Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1)
   /Producer ()
   /DOCINFO pdfmark

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5f066b2e/apidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/apidocs/allclasses-frame.html b/apidocs/allclasses-frame.html
index adc0f68..75cff86 100644
--- a/apidocs/allclasses-frame.html
+++ b/apidocs/allclasses-frame.html
@@ -162,6 +162,7 @@
 <li><a href="org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.html" 
title="class in org.apache.hadoop.hbase.zookeeper" 
target="classFrame">MiniZooKeeperCluster</a></li>
 <li><a href="org/apache/hadoop/hbase/mob/MobConstants.html" title="class in 
org.apache.hadoop.hbase.mob" target="classFrame">MobConstants</a></li>
 <li><a href="org/apache/hadoop/hbase/MultiActionResultTooLarge.html" 
title="class in org.apache.hadoop.hbase" 
target="classFrame">MultiActionResultTooLarge</a></li>
+<li><a href="org/apache/hadoop/hbase/mapreduce/MultiHFileOutputFormat.html" 
title="class in org.apache.hadoop.hbase.mapreduce" 
target="classFrame">MultiHFileOutputFormat</a></li>
 <li><a href="org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html" 
title="class in org.apache.hadoop.hbase.filter" 
target="classFrame">MultipleColumnPrefixFilter</a></li>
 <li><a href="org/apache/hadoop/hbase/filter/MultiRowRangeFilter.html" 
title="class in org.apache.hadoop.hbase.filter" 
target="classFrame">MultiRowRangeFilter</a></li>
 <li><a href="org/apache/hadoop/hbase/filter/MultiRowRangeFilter.RowRange.html" 
title="class in org.apache.hadoop.hbase.filter" 
target="classFrame">MultiRowRangeFilter.RowRange</a></li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5f066b2e/apidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/apidocs/allclasses-noframe.html b/apidocs/allclasses-noframe.html
index abdeef7..bb04ead 100644
--- a/apidocs/allclasses-noframe.html
+++ b/apidocs/allclasses-noframe.html
@@ -162,6 +162,7 @@
 <li><a href="org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.html" 
title="class in org.apache.hadoop.hbase.zookeeper">MiniZooKeeperCluster</a></li>
 <li><a href="org/apache/hadoop/hbase/mob/MobConstants.html" title="class in 
org.apache.hadoop.hbase.mob">MobConstants</a></li>
 <li><a href="org/apache/hadoop/hbase/MultiActionResultTooLarge.html" 
title="class in org.apache.hadoop.hbase">MultiActionResultTooLarge</a></li>
+<li><a href="org/apache/hadoop/hbase/mapreduce/MultiHFileOutputFormat.html" 
title="class in 
org.apache.hadoop.hbase.mapreduce">MultiHFileOutputFormat</a></li>
 <li><a href="org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html" 
title="class in 
org.apache.hadoop.hbase.filter">MultipleColumnPrefixFilter</a></li>
 <li><a href="org/apache/hadoop/hbase/filter/MultiRowRangeFilter.html" 
title="class in org.apache.hadoop.hbase.filter">MultiRowRangeFilter</a></li>
 <li><a href="org/apache/hadoop/hbase/filter/MultiRowRangeFilter.RowRange.html" 
title="class in 
org.apache.hadoop.hbase.filter">MultiRowRangeFilter.RowRange</a></li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5f066b2e/apidocs/deprecated-list.html
----------------------------------------------------------------------
diff --git a/apidocs/deprecated-list.html b/apidocs/deprecated-list.html
index 47929fe..705f948 100644
--- a/apidocs/deprecated-list.html
+++ b/apidocs/deprecated-list.html
@@ -325,6 +325,12 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a 
href="org/apache/hadoop/hbase/client/Admin.html#mergeRegions(byte[],%20byte[],%20boolean)">org.apache.hadoop.hbase.client.Admin.mergeRegions(byte[],
 byte[], boolean)</a>
+<div class="block"><i>Since 2.0. Will be removed in 3.0. Use
+     <a 
href="org/apache/hadoop/hbase/client/Admin.html#mergeRegionsAsync(byte[],%20byte[],%20boolean)"><code>Admin.mergeRegionsAsync(byte[],
 byte[], boolean)</code></a> instead.</i></div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/Admin.html#modifyColumn(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.HColumnDescriptor)">org.apache.hadoop.hbase.client.Admin.modifyColumn(TableName,
 HColumnDescriptor)</a>
 <div class="block"><i>As of release 2.0.0.
              (<a 
href="https://issues.apache.org/jira/browse/HBASE-1989";>HBASE-1989</a>).
@@ -332,92 +338,92 @@
              Use <a 
href="org/apache/hadoop/hbase/client/Admin.html#modifyColumnFamily(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.HColumnDescriptor)"><code>Admin.modifyColumnFamily(TableName,
 HColumnDescriptor)</code></a>.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html#parseTableCFsFromConfig(java.lang.String)">org.apache.hadoop.hbase.client.replication.ReplicationAdmin.parseTableCFsFromConfig(String)</a>
 <div class="block"><i>as release of 2.0.0, and it will be removed in 
3.0.0</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(byte[],%20java.util.List)">org.apache.hadoop.hbase.client.HTableMultiplexer.put(byte[],
 List<Put>)</a>
 <div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(org.apache.hadoop.hbase.TableName,%20java.util.List)"><code>HTableMultiplexer.put(TableName,
 List)</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(byte[],%20org.apache.hadoop.hbase.client.Put)">org.apache.hadoop.hbase.client.HTableMultiplexer.put(byte[],
 Put)</a>
 <div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Put)"><code>HTableMultiplexer.put(TableName,
 Put)</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(byte[],%20org.apache.hadoop.hbase.client.Put,%20int)">org.apache.hadoop.hbase.client.HTableMultiplexer.put(byte[],
 Put, int)</a>
 <div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/client/HTableMultiplexer.html#put(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Put)"><code>HTableMultiplexer.put(TableName,
 Put)</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#putIntUnsafe(byte[],%20int,%20int)">org.apache.hadoop.hbase.util.Bytes.putIntUnsafe(byte[],
 int, int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#putLongUnsafe(byte[],%20int,%20long)">org.apache.hadoop.hbase.util.Bytes.putLongUnsafe(byte[],
 int, long)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#putShortUnsafe(byte[],%20int,%20short)">org.apache.hadoop.hbase.util.Bytes.putShortUnsafe(byte[],
 int, short)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#readVLong(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.readVLong(byte[],
 int)</a>
 <div class="block"><i>Use <a 
href="org/apache/hadoop/hbase/util/Bytes.html#readAsVLong(byte[],%20int)"><code>Bytes.readAsVLong(byte[],int)</code></a>
 instead.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html#removePeerTableCFs(java.lang.String,%20java.lang.String)">org.apache.hadoop.hbase.client.replication.ReplicationAdmin.removePeerTableCFs(String,
 String)</a>
 <div class="block"><i>as release of 2.0.0, and it will be removed in 3.0.0,
  use <a 
href="org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html#removePeerTableCFs(java.lang.String,%20java.util.Map)"><code>ReplicationAdmin.removePeerTableCFs(String,
 Map)</code></a> instead.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/Get.html#setClosestRowBefore(boolean)">org.apache.hadoop.hbase.client.Get.setClosestRowBefore(boolean)</a>
 <div class="block"><i>since 2.0.0 and will be removed in 3.0.0</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#setName(byte[])">org.apache.hadoop.hbase.HTableDescriptor.setName(byte[])</a></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#setName(org.apache.hadoop.hbase.TableName)">org.apache.hadoop.hbase.HTableDescriptor.setName(TableName)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#setOwner(org.apache.hadoop.hbase.security.User)">org.apache.hadoop.hbase.HTableDescriptor.setOwner(User)</a></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/HTableDescriptor.html#setOwnerString(java.lang.String)">org.apache.hadoop.hbase.HTableDescriptor.setOwnerString(String)</a></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/client/Table.html#setWriteBufferSize(long)">org.apache.hadoop.hbase.client.Table.setWriteBufferSize(long)</a>
 <div class="block"><i>as of 1.0.1 (should not have been in 1.0.0). Replaced by 
<a href="org/apache/hadoop/hbase/client/BufferedMutator.html" title="interface 
in org.apache.hadoop.hbase.client"><code>BufferedMutator</code></a> and
  <a 
href="org/apache/hadoop/hbase/client/BufferedMutatorParams.html#writeBufferSize(long)"><code>BufferedMutatorParams.writeBufferSize(long)</code></a></i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/CellUtil.html#tagsIterator(byte[],%20int,%20int)">org.apache.hadoop.hbase.CellUtil.tagsIterator(byte[],
 int, int)</a>
 <div class="block"><i>As of 2.0.0 and will be removed in 3.0.0
              Instead use <a 
href="org/apache/hadoop/hbase/CellUtil.html#tagsIterator(org.apache.hadoop.hbase.Cell)"><code>CellUtil.tagsIterator(Cell)</code></a></i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#toIntUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toIntUnsafe(byte[],
 int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#toLongUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toLongUnsafe(byte[],
 int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a 
href="org/apache/hadoop/hbase/util/Bytes.html#toShortUnsafe(byte[],%20int)">org.apache.hadoop.hbase.util.Bytes.toShortUnsafe(byte[],
 int)</a>
 <div class="block"><i>As of release 2.0.0, this will be removed in HBase 
3.0.0.</i></div>
 </td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5f066b2e/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/apidocs/index-all.html b/apidocs/index-all.html
index 7a16792..04d5a94 100644
--- a/apidocs/index-all.html
+++ b/apidocs/index-all.html
@@ -5655,6 +5655,8 @@
 </dd>
 <dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html#getRecordWriter(org.apache.hadoop.mapreduce.TaskAttemptContext)">getRecordWriter(TaskAttemptContext)</a></span>
 - Method in class org.apache.hadoop.hbase.mapreduce.<a 
href="./org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html" title="class 
in org.apache.hadoop.hbase.mapreduce">HFileOutputFormat2</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/mapreduce/MultiHFileOutputFormat.html#getRecordWriter(org.apache.hadoop.mapreduce.TaskAttemptContext)">getRecordWriter(TaskAttemptContext)</a></span>
 - Method in class org.apache.hadoop.hbase.mapreduce.<a 
href="./org/apache/hadoop/hbase/mapreduce/MultiHFileOutputFormat.html" 
title="class in 
org.apache.hadoop.hbase.mapreduce">MultiHFileOutputFormat</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html#getRecordWriter(org.apache.hadoop.mapreduce.TaskAttemptContext)">getRecordWriter(TaskAttemptContext)</a></span>
 - Method in class org.apache.hadoop.hbase.mapreduce.<a 
href="./org/apache/hadoop/hbase/mapreduce/MultiTableOutputFormat.html" 
title="class in 
org.apache.hadoop.hbase.mapreduce">MultiTableOutputFormat</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html#getRecordWriter(org.apache.hadoop.mapreduce.TaskAttemptContext)">getRecordWriter(TaskAttemptContext)</a></span>
 - Method in class org.apache.hadoop.hbase.mapreduce.<a 
href="./org/apache/hadoop/hbase/mapreduce/TableOutputFormat.html" title="class 
in org.apache.hadoop.hbase.mapreduce">TableOutputFormat</a></dt>
@@ -8726,6 +8728,13 @@
 </dd>
 <dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/client/Admin.html#mergeRegions(byte[],%20byte[],%20boolean)">mergeRegions(byte[],
 byte[], boolean)</a></span> - Method in interface 
org.apache.hadoop.hbase.client.<a 
href="./org/apache/hadoop/hbase/client/Admin.html" title="interface in 
org.apache.hadoop.hbase.client">Admin</a></dt>
 <dd>
+<div class="block"><span class="strong">Deprecated.</span>
+<div class="block"><i>Since 2.0. Will be removed in 3.0. Use
+     <a 
href="./org/apache/hadoop/hbase/client/Admin.html#mergeRegionsAsync(byte[],%20byte[],%20boolean)"><code>Admin.mergeRegionsAsync(byte[],
 byte[], boolean)</code></a> instead.</i></div>
+</div>
+</dd>
+<dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/client/Admin.html#mergeRegionsAsync(byte[],%20byte[],%20boolean)">mergeRegionsAsync(byte[],
 byte[], boolean)</a></span> - Method in interface 
org.apache.hadoop.hbase.client.<a 
href="./org/apache/hadoop/hbase/client/Admin.html" title="interface in 
org.apache.hadoop.hbase.client">Admin</a></dt>
+<dd>
 <div class="block">Merge two regions.</div>
 </dd>
 <dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/HConstants.html#META_REPLICAS_NUM">META_REPLICAS_NUM</a></span>
 - Static variable in class org.apache.hadoop.hbase.<a 
href="./org/apache/hadoop/hbase/HConstants.html" title="class in 
org.apache.hadoop.hbase">HConstants</a></dt>
@@ -8918,6 +8927,21 @@
 </dd>
 <dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/MultiActionResultTooLarge.html#MultiActionResultTooLarge(java.lang.String)">MultiActionResultTooLarge(String)</a></span>
 - Constructor for exception org.apache.hadoop.hbase.<a 
href="./org/apache/hadoop/hbase/MultiActionResultTooLarge.html" title="class in 
org.apache.hadoop.hbase">MultiActionResultTooLarge</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="./org/apache/hadoop/hbase/mapreduce/MultiHFileOutputFormat.html" 
title="class in org.apache.hadoop.hbase.mapreduce"><span 
class="strong">MultiHFileOutputFormat</span></a> - Class in <a 
href="./org/apache/hadoop/hbase/mapreduce/package-summary.html">org.apache.hadoop.hbase.mapreduce</a></dt>
+<dd>
+<div class="block">Create 3 level tree directory, first level is using table 
name as parent directory and then use
+ family name as child directory, and all related HFiles for one family are 
under child directory
+ -tableName1
+   -columnFamilyName1
+   -columnFamilyName2
+     -HFiles
+ -tableName2
+   -columnFamilyName1
+     -HFiles
+   -columnFamilyName2</div>
+</dd>
+<dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/mapreduce/MultiHFileOutputFormat.html#MultiHFileOutputFormat()">MultiHFileOutputFormat()</a></span>
 - Constructor for class org.apache.hadoop.hbase.mapreduce.<a 
href="./org/apache/hadoop/hbase/mapreduce/MultiHFileOutputFormat.html" 
title="class in 
org.apache.hadoop.hbase.mapreduce">MultiHFileOutputFormat</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="strong"><a 
href="./org/apache/hadoop/hbase/util/Bytes.html#multiple(byte[],%20int)">multiple(byte[],
 int)</a></span> - Static method in class org.apache.hadoop.hbase.util.<a 
href="./org/apache/hadoop/hbase/util/Bytes.html" title="class in 
org.apache.hadoop.hbase.util">Bytes</a></dt>
 <dd>
 <div class="block">Create a byte array which is multiple given bytes</div>

Reply via email to