Jason Lowe cbc3288b55 MAPREDUCE-6554. MRAppMaster servicestart failing with NPE in MRAppMaster#parsePreviousJobHistory. Contributed by Bibin A Chundatt ...

(cherry picked from commit 296ecbd5ec9f7d2eed84217a3318b4a3bcd7bd99)

Conflicts:

	hadoop-mapreduce-project/CHANGES.txt

2016-01-15 17:04:34 +00: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-6554. MRAppMaster servicestart failing with NPE in MRAppMaster#parsePreviousJobHistory. Contributed by Bibin A Chundatt

2016-01-15 17:04:34 +00:00

hadoop-mapreduce-examples

Preparing for 2.6.4 development

2016-01-05 15:40:31 -08:00

lib/jdiff

JDiff output for release 0.22.0

2011-12-12 05:47:46 +00:00

.gitignore

…

CHANGES.txt

MAPREDUCE-6554. MRAppMaster servicestart failing with NPE in MRAppMaster#parsePreviousJobHistory. Contributed by Bibin A Chundatt

2016-01-15 17:04:34 +00:00

pom.xml

Preparing for 2.6.4 development

2016-01-05 15:40:31 -08:00