Thomas Graves 6a743f3f5b merge -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409034 13f79535-47bb-0310-9956-ffa450edef68		2012-11-13 23:49:04 +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	merge -r 1394608:1394609 from trunk. FIXES: MAPREDUCE-4712	2012-10-08 19:04:43 +00:00
conf	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
dev-support	Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417	2012-07-26 13:25:41 +00:00
hadoop-mapreduce-client	merge -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517	2012-11-13 23:49:04 +00:00
hadoop-mapreduce-examples	HADOOP-8911. CRLF characters in source and text files (trunk equivalent patch). Contributed Raja Aluri.	2012-10-12 04:48:40 +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 -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517	2012-11-13 23:49:04 +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-8738. Reverted since it broke MR based system tests.	2012-10-01 22:44:08 +00:00