Jian He 9b973b7c83 MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du ... Conflicts: hadoop-mapreduce-project/CHANGES.txt		2014-10-22 10:57:32 -07:00
..
.eclipse.templates	…
bin	Merged revision(s) 1610964 from hadoop/common/trunk:	2014-07-16 10:49:04 +00:00
conf	HADOOP-10040. Merging change r1531977 from trunk to branch-2.	2013-10-14 17:06:42 +00:00
dev-support	MAPREDUCE-5844. Add a configurable delay to reducer-preemption. (Maysam Yabandeh via kasha)	2014-06-19 21:13:14 +00:00
hadoop-mapreduce-client	MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in client. Contributed by Rohith	2014-10-17 19:53:17 +00:00
hadoop-mapreduce-examples	Revert "MAPREDUCE-5911. Terasort TeraOutputFormat does not check for output directory existance. Contributed by Bruno P. Kinoshita."	2014-10-19 23:50:42 -04:00
lib/jdiff	…
.gitignore	…
CHANGES.txt	MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du	2014-10-22 10:57:32 -07:00
pom.xml	Preparing for 2.6.0 development. Updated versions.	2014-07-03 06:11:57 +00:00