Zhijie Shen 8cde949397 MAPREDUCE-6002. Made MR task avoid reporting error to AM when the task process is shutting down. Contributed by Wangda Tan. ...

svn merge --ignore-ancestry -c 1613743 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613744 13f79535-47bb-0310-9956-ffa450edef68

2014-07-27 01:41:44 +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

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-6002. Made MR task avoid reporting error to AM when the task process is shutting down. Contributed by Wangda Tan.

2014-07-27 01:41:44 +00:00

hadoop-mapreduce-examples

Preparing for 2.6.0 development. Updated versions.

2014-07-03 06:11:57 +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

MAPREDUCE-6002. Made MR task avoid reporting error to AM when the task process is shutting down. Contributed by Wangda Tan.

2014-07-27 01:41:44 +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

HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.

2011-08-25 00:14:24 +00:00

pom.xml

Preparing for 2.6.0 development. Updated versions.

2014-07-03 06:11:57 +00:00