From 51957ca81886ac3553c44848631fdf53766a25ae Mon Sep 17 00:00:00 2001 From: "Arun C. Murthy" Date: Wed, 12 Nov 2014 10:41:24 -0800 Subject: [PATCH] YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1. --- hadoop-yarn-project/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 78fd6ceb1f4..f869fde5a34 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -84,9 +84,6 @@ Release 2.7.0 - UNRELEASED YARN-2713. "RM Home" link in NM should point to one of the RMs in an HA setup. (kasha) - YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so - as to make them work correctly. (Wangda Tan via vinodkv) - Release 2.6.0 - 2014-11-15 INCOMPATIBLE CHANGES @@ -949,6 +946,9 @@ Release 2.6.0 - 2014-11-15 YARN-2841. RMProxy should retry EOFException. (Jian He via xgong) + YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so + as to make them work correctly. (Wangda Tan via vinodkv) + Release 2.5.2 - 2014-11-10 INCOMPATIBLE CHANGES