Suresh Srinivas 7ba49c56aa Merge changes r1453645 for HADOOP-9373, r1453675 for HADOOP-9376, r1453676 for HADOOP-9365, r1454108 for HADOOP-9364. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485853 13f79535-47bb-0310-9956-ffa450edef68		2013-05-23 21:17:38 +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	MAPREDUCE-4808. Refactor MapOutput and MergeManager to facilitate reuse by Shuffle implementations. (masokan via tucu)	2013-01-26 00:41:12 +00:00
hadoop-mapreduce-client	HADOOP-8562. Merge r1453486 from trunk	2013-05-23 20:41:53 +00:00
hadoop-mapreduce-examples	MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen.	2013-05-22 06:37:01 +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	HADOOP-9372. Merge r1453637 from trunk	2013-05-23 21:09:50 +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	HADOOP-9373. Merge change r1453599 from trunk	2013-05-23 21:07:05 +00:00