Jian He d3462755bb Merge r1603338 from trunk. MAPREDUCE-5924. Changed TaskAttemptImpl to ignore TA_COMMIT_PENDING event at COMMIT_PENDING state. Contributed by Zhijie Shen ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603339 13f79535-47bb-0310-9956-ffa450edef68		2014-06-18 00:53:23 +00:00
..
.eclipse.templates	…
bin	MAPREDUCE-5818. Added "hsadmin" command into mapred.cmd. Contributed by Jian He.	2014-04-03 20:26:49 +00:00
conf	HADOOP-10040. Merging change r1531977 from trunk to branch-2.	2013-10-14 17:06:42 +00:00
dev-support	MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)	2014-05-13 19:14:07 +00:00
hadoop-mapreduce-client	Merge r1603338 from trunk. MAPREDUCE-5924. Changed TaskAttemptImpl to ignore TA_COMMIT_PENDING event at COMMIT_PENDING state. Contributed by Zhijie Shen	2014-06-18 00:53:23 +00:00
hadoop-mapreduce-examples	MAPREDUCE-5886. Merging change r1601704 from trunk to branch-2.	2014-06-10 17:52:27 +00:00
lib/jdiff	JDiff output for release 0.22.0	2011-12-12 05:47:46 +00:00
.gitignore	…
CHANGES.txt	Merge r1603338 from trunk. MAPREDUCE-5924. Changed TaskAttemptImpl to ignore TA_COMMIT_PENDING event at COMMIT_PENDING state. Contributed by Zhijie Shen	2014-06-18 00:53:23 +00:00
INSTALL	merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.	2013-09-25 00:37:14 +00:00
LICENSE.txt	MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)	2014-05-13 19:14:07 +00:00
NOTICE.txt	…
pom.xml	MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)	2014-05-13 19:14:07 +00:00