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
..
src/main/resources/assemblies	Merge remote-tracking branch 'origin/trunk' into MR-2841	2014-09-02 15:55:54 -07:00
pom.xml	HADOOP-8268. A few pom.xml across Hadoop project may fail XML validation. Contributed by Radim Kolar. (harsh)	2012-05-28 14:51:05 +00:00