You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by at...@apache.org on 2012/01/23 19:07:29 UTC
svn commit: r1234924 - in /hadoop/common/branches/HDFS-1623: ./
hadoop-project/src/site/site.xml
Author: atm
Date: Mon Jan 23 18:07:27 2012
New Revision: 1234924
URL: http://svn.apache.org/viewvc?rev=1234924&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 Jan 23 18:07:27 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1234085
+/hadoop/common/trunk:1152502-1234923
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=1234924&r1=1234923&r2=1234924&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 Jan 23 18:07:27 2012
@@ -62,6 +62,14 @@
<item name="Writing Yarn Applications" href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>
<item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
</menu>
+
+ <menu name="YARN REST API's" inherit="top">
+ <item name="Introduction" href="hadoop-yarn/hadoop-yarn-site/WebServicesIntro.html"/>
+ <item name="Resource Manager" href="hadoop-yarn/hadoop-yarn-site/ResourceManagerRest.html"/>
+ <item name="Node Manager" href="hadoop-yarn/hadoop-yarn-site/NodeManagerRest.html"/>
+ <item name="Mapreduce Application Master" href="hadoop-yarn/hadoop-yarn-site/MapredAppMasterRest.html"/>
+ <item name="History Server" href="hadoop-yarn/hadoop-yarn-site/HistoryServerRest.html"/>
+ </menu>
<menu name="Auth" inherit="top">
<item name="Overview" href="hadoop-auth/index.html"/>