Author: tucu
Date: Thu Jul 26 13:25:41 2012
New Revision: 1365982
URL: http://svn.apache.org/viewvc?rev=1365982&view=rev
Log:
Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417
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=1365982&r1=1365981&r2=1365982&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 Thu Jul 26
13:25:41 2012
@@ -66,6 +66,7 @@
<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"/>
<item name="Web Application Proxy"
href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
+ <item name="Encrypted Shuffle"
href="hadoop-yarn/hadoop-yarn-site/EncryptedShuffle.html"/>
<item name="Yarn Commands"
href="hadoop-yarn/hadoop-yarn-site/YarnCommands.html"/>
</menu>
