Author: todd
Date: Thu Oct 11 08:11:51 2012
New Revision: 1396943
URL: http://svn.apache.org/viewvc?rev=1396943&view=rev
Log:
Merge HDFS-3077 into trunk
Modified:
hadoop/common/trunk/ (props changed)
hadoop/common/trunk/hadoop-project/src/site/site.xml
Propchange: hadoop/common/trunk/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-3077:r1363593-1396941
Modified: hadoop/common/trunk/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/src/site/site.xml?rev=1396943&r1=1396942&r2=1396943&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/trunk/hadoop-project/src/site/site.xml Thu Oct 11 08:11:51
2012
@@ -54,7 +54,8 @@
</menu>
<menu name="HDFS" inherit="top">
- <item name="High Availability"
href="hadoop-yarn/hadoop-yarn-site/HDFSHighAvailability.html"/>
+ <item name="High Availability With QJM"
href="hadoop-yarn/hadoop-yarn-site/HDFSHighAvailabilityWithQJM.html"/>
+ <item name="High Availability With NFS"
href="hadoop-yarn/hadoop-yarn-site/HDFSHighAvailabilityWithNFS.html"/>
<item name="Federation"
href="hadoop-yarn/hadoop-yarn-site/Federation.html"/>
<item name="WebHDFS REST API"
href="hadoop-yarn/hadoop-yarn-site/WebHDFS.html"/>
<item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/>
