YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit d648e60eba)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
This commit is contained in:
Arun C. Murthy 2014-11-13 10:04:45 -08:00
parent 56020955fd
commit 32032ace21
1 changed files with 3 additions and 0 deletions

View File

@ -873,6 +873,9 @@ Release 2.6.0 - 2014-11-15
reacquireContainer() that interrupted by NodeManager restart. (Junping Du
via jlowe)
YARN-2853. Fixed a bug in ResourceManager causing apps to hang when the user
kill request races with ApplicationMaster finish. (Jian He via vinodkv)
Release 2.5.2 - 2014-11-10
INCOMPATIBLE CHANGES