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

This commit is contained in:
Arun C. Murthy 2014-11-12 10:36:54 -08:00
parent 44feec7122
commit 3e7a5157f0

View File

@ -84,8 +84,6 @@ Release 2.7.0 - UNRELEASED
YARN-2713. "RM Home" link in NM should point to one of the RMs in an YARN-2713. "RM Home" link in NM should point to one of the RMs in an
HA setup. (kasha) HA setup. (kasha)
YARN-2841. RMProxy should retry EOFException. (Jian He via xgong)
YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so
as to make them work correctly. (Wangda Tan via vinodkv) as to make them work correctly. (Wangda Tan via vinodkv)
@ -949,6 +947,8 @@ Release 2.6.0 - 2014-11-15
consistent with the (somewhat incorrect) behaviour in the non-recovery case. consistent with the (somewhat incorrect) behaviour in the non-recovery case.
(Jian He via vinodkv) (Jian He via vinodkv)
YARN-2841. RMProxy should retry EOFException. (Jian He via xgong)
Release 2.5.2 - 2014-11-10 Release 2.5.2 - 2014-11-10
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES