From 349b0e3cfb39e0c8381fa77d9a662f7dcc8e029b Mon Sep 17 00:00:00 2001 From: Jian He Date: Fri, 11 Jul 2014 00:10:05 +0000 Subject: [PATCH] Merge r1609594 from trunk. Moved few YARN entries in CHANGES.txt from 2.5 to 2.6 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609595 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 55607a612ec..a7c6fbb86e3 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -8,6 +8,15 @@ Release 2.6.0 - UNRELEASED YARN-2131. Add a way to format the RMStateStore. (Robert Kanter via kasha) + YARN-1367. Changed NM to not kill containers on NM resync if RM work-preserving + restart is enabled. (Anubhav Dhoot via jianhe) + + YARN-1366. Changed AMRMClient to re-register with RM and send outstanding requests + back to RM on work-preserving RM restart. (Rohith via jianhe) + + YARN-2181. Added preemption info to logs and RM web UI. (Wangda Tan via + jianhe) + IMPROVEMENTS YARN-2242. Improve exception information on AM launch crashes. (Li Lu @@ -20,6 +29,9 @@ Release 2.6.0 - UNRELEASED YARN-2251. Avoid negative elapsed time in JHS/MRAM web UI and services. (Zhijie Shen via junping_du) + YARN-2088. Fixed a bug in GetApplicationsRequestPBImpl#mergeLocalToBuilder. + (Binglin Chang via jianhe) + Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -56,18 +68,6 @@ Release 2.5.0 - UNRELEASED YARN-1713. Added get-new-app and submit-app functionality to RM web services. (Varun Vasudev via vinodkv) - YARN-1367. Changed NM to not kill containers on NM resync if RM work-preserving - restart is enabled. (Anubhav Dhoot via jianhe) - - YARN-1366. Changed AMRMClient to re-register with RM and send outstanding requests - back to RM on work-preserving RM restart. (Rohith via jianhe) - - YARN-2181. Added preemption info to logs and RM web UI. (Wangda Tan via - jianhe) - - YARN-2088. Fixed a bug in GetApplicationsRequestPBImpl#mergeLocalToBuilder. - (Binglin Chang via jianhe) - IMPROVEMENTS YARN-1479. Invalid NaN values in Hadoop REST API JSON response (Chen He via