Author: acmurthy
Date: Sun Jun 16 19:10:39 2013
New Revision: 1493572
URL: http://svn.apache.org/r1493572
Log:
Merge -c 1493570 from trunk to branch-2.1-beta to fix MAPREDUCE-5184. Document
compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1.
Contributed by Zhijie Shen.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-project/src/site/site.xml
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-project/src/site/site.xml?rev=1493572&r1=1493571&r2=1493572&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-project/src/site/site.xml
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-project/src/site/site.xml Sun
Jun 16 19:10:39 2013
@@ -79,6 +79,7 @@
</menu>
<menu name="MapReduce" inherit="top">
+ <item name="Compatibilty between Hadoop 1.x and Hadoop 2.x"
href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduce_Compatibility_Hadoop1_Hadoop2.html"/>
<item name="Encrypted Shuffle"
href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html"/>
<item name="Pluggable Shuffle/Sort"
href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/PluggableShuffleAndPluggableSort.html"/>
</menu>
