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-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm?rev=1493572&r1=1493571&r2=1493572&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm
Sun Jun 16 19:10:39 2013
@@ -53,5 +53,6 @@ MapReduce NextGen aka YARN aka MRv2
* {{{../../hadoop-project-dist/hadoop-common/CLIMiniCluster.html}CLI
MiniCluster}}
- *
{{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html}Encrypted
Shuffle}}
+ *
{{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduce_Compatibility_Hadoop1_Hadoop2.html}Backward
Compatibility between Apache Hadoop 1.x and 2.x for MapReduce}}
+ *
{{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html}Encrypted
Shuffle}}
