Author: atm
Date: Mon Nov 28 18:21:46 2011
New Revision: 1207490
URL: http://svn.apache.org/viewvc?rev=1207490&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 18:21:46 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1204792
+/hadoop/common/trunk:1152502-1207485
Modified: hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml?rev=1207490&r1=1207489&r2=1207490&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml Mon Nov
28 18:21:46 2011
@@ -54,6 +54,7 @@
<menu name="HDFS" inherit="top">
<item name="Federation"
href="hadoop-yarn/hadoop-yarn-site/Federation.html"/>
+ <item name="WebHDFS REST API"
href="hadoop-yarn/hadoop-yarn-site/WebHDFS.html"/>
</menu>
<menu name="MapReduce" inherit="top">
