Todd Lipcon cce7d1e2f9 Merge remote-tracking branch 'origin/trunk' into MR-2841 ... Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java		2014-09-02 15:55:54 -07: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-11013. CLASSPATH handling should be consolidated, debuggable (aw)	2014-08-28 18:09:25 -07:00
conf	HADOOP-9902. Shell script rewrite (aw)	2014-08-19 12:11:17 +00:00
dev-support	MAPREDUCE-5844. Add a configurable delay to reducer-preemption. (Maysam Yabandeh via kasha)	2014-06-19 17:22:56 +00:00
hadoop-mapreduce-client	Merge remote-tracking branch 'origin/trunk' into MR-2841	2014-09-02 15:55:54 -07:00
hadoop-mapreduce-examples	MAPREDUCE-5886. Allow wordcount example job to accept multiple input paths. Contributed by Chris Nauroth.	2014-06-10 17:48:52 +00:00
lib/jdiff	JDiff output for release 0.22.0	2011-12-12 05:45:08 +00:00
.gitignore	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00
CHANGES.MAPREDUCE-2841.txt	MAPREDUCE-6056. native-task: move system test working dir to target dir and cleanup test config xml files (Manu Zhang via bchang)	2014-09-02 16:26:09 +08:00
CHANGES.txt	MAPREDUCE-5931. Validate SleepJob command line parameters. Contributed by Gera Shegalov	2014-08-29 19:50:15 +00:00
INSTALL	YARN-1229. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.	2013-09-25 00:35:03 +00:00
LICENSE.txt	MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)	2014-05-13 19:10:48 +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	MAPREDUCE-6025: distribute nativetask.so to right folder (Manu Zhang)	2014-08-15 08:55:49 +00:00