http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html index db52c0e..a52efa6 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html @@ -826,7 +826,7 @@ <span class="sourceLineNo">818</span> Path hfileStagingPath = null;<a name="line.818"></a> <span class="sourceLineNo">819</span> Path hfileOrigPath = new Path(el.getSecond());<a name="line.819"></a> <span class="sourceLineNo">820</span> try {<a name="line.820"></a> -<span class="sourceLineNo">821</span> hfileStagingPath= new Path(secureClient.getStagingPath(bulkToken, el.getFirst()),<a name="line.821"></a> +<span class="sourceLineNo">821</span> hfileStagingPath= new Path(new Path(bulkToken, Bytes.toString(el.getFirst())),<a name="line.821"></a> <span class="sourceLineNo">822</span> hfileOrigPath.getName());<a name="line.822"></a> <span class="sourceLineNo">823</span> if(targetFs.rename(hfileStagingPath, hfileOrigPath)) {<a name="line.823"></a> <span class="sourceLineNo">824</span> LOG.debug("Moved back file " + hfileOrigPath + " from " +<a name="line.824"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/book.html ---------------------------------------------------------------------- diff --git a/book.html b/book.html index cb70113..1a266fc 100644 --- a/book.html +++ b/book.html @@ -27310,6 +27310,11 @@ If you are running, for example HBase-0.94 and wanted to build against Hadoop 0. <p>You may need to change the protobuf definitions that reside in the <em>hbase-protocol</em> module or other modules.</p> </div> <div class="paragraph"> +<p>Previous to hbase-2.0.0, protobuf definition files were sprinkled across all hbase modules but now all +to do with protobuf must reside in the hbase-protocol module; we are trying to contain our protobuf +use so we can freely change versions without upsetting any downstream project use of protobuf.</p> +</div> +<div class="paragraph"> <p>The protobuf files are located in <em>hbase-protocol/src/main/protobuf</em>. For the change to be effective, you will need to regenerate the classes. You can use maven profile <code>compile-protobuf</code> to do this.</p> @@ -34058,7 +34063,7 @@ The server will return cellblocks compressed using this same compressor as long <div id="footer"> <div id="footer-text"> Version 2.0.0-SNAPSHOT<br> -Last updated 2016-07-20 15:30:42 UTC +Last updated 2016-07-24 14:31:11 UTC </div> </div> </body> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5513910e/bulk-loads.html ---------------------------------------------------------------------- diff --git a/bulk-loads.html b/bulk-loads.html index ebc11f9..ccbe55e 100644 --- a/bulk-loads.html +++ b/bulk-loads.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20160720" /> + <meta name="Date-Revision-yyyymmdd" content="20160724" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase – Bulk Loads in Apache HBase (TM) @@ -305,7 +305,7 @@ under the License. --> <a href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2016-07-20</li> + <li id="publishDate" class="pull-right">Last Published: 2016-07-24</li> </p> </div>
