hadoop/hadoop-mapreduce-project
Vinod Kumar Vavilapalli ce23eea57f YARN-837. Moved yarn.ClusterInfo into MapReduce project as it doesn't belong to YARN. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1493676 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493677 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 08:15:05 +00:00
..
.eclipse.templates HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. 2011-08-25 00:14:24 +00:00
bin HADOOP-8562. Merge r1453486 from trunk 2013-05-23 20:41:53 +00:00
conf MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves) 2013-01-14 15:01:35 +00:00
dev-support Merge -c 1493445 from trunk to branch-2 to fix MAPREDUCE-5192. Allow for alternate resolutions of TaskCompletionEvents. Contributed by Chris Douglas. 2013-06-16 03:07:56 +00:00
hadoop-mapreduce-client YARN-837. Moved yarn.ClusterInfo into MapReduce project as it doesn't belong to YARN. Contributed by Zhijie Shen. 2013-06-17 08:15:05 +00:00
hadoop-mapreduce-examples Set version in branch-2 to 2.2.0-SNAPSHOT. 2013-06-04 15:34:52 +00:00
lib/jdiff JDiff output for release 0.22.0 2011-12-12 05:47:46 +00:00
.gitignore HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. 2011-08-25 00:14:24 +00:00
CHANGES.txt Merge -c 1493570 from trunk to branch-2 to fix MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen. 2013-06-16 19:10:32 +00:00
INSTALL Merge -c 1390218 from trunk to branch-2 to fix MAPREDUCE-4649. Ensure MapReduce JobHistory Daemon doens't assume HADOOP_YARN_HOME and HADOOP_MAPRED_HOME are the same. Contributed by Vinod K V. 2012-09-25 23:50:03 +00:00
LICENSE.txt HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. 2011-08-25 00:14:24 +00:00
NOTICE.txt HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. 2011-08-25 00:14:24 +00:00
pom.xml Set version in branch-2 to 2.2.0-SNAPSHOT. 2013-06-04 15:34:52 +00:00