Author: vinodkv
Date: Wed Apr 30 18:01:05 2014
New Revision: 1591417
URL: http://svn.apache.org/r1591417
Log:
YARN-1696. Added documentation for ResourceManager fail-over. Contributed by
Karthik Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA.
svn merge --ignore-ancestry -c 1591416 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
Modified: hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml?rev=1591417&r1=1591416&r2=1591417&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml Wed Apr 30
18:01:05 2014
@@ -101,6 +101,7 @@
<item name="Capacity Scheduler"
href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
<item name="Fair Scheduler"
href="hadoop-yarn/hadoop-yarn-site/FairScheduler.html"/>
<item name="ResourceManager Restart"
href="hadoop-yarn/hadoop-yarn-site/ResourceManagerRestart.html"/>
+ <item name="ResourceManager HA"
href="hadoop-yarn/hadoop-yarn-site/ResourceManagerHA.html"/>
<item name="Web Application Proxy"
href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
<item name="YARN Timeline Server"
href="hadoop-yarn/hadoop-yarn-site/TimelineServer.html"/>
<item name="Writing YARN Applications"
href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>