From 812674450660fcccb92ff52f57b0840ecd8ce843 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Wed, 2 Jul 2014 21:52:13 +0000 Subject: [PATCH] YARN-2022. Fixing CHANGES.txt to be correctly placed. svn merge --ignore-ancestry -c 1607486 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607487 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 56a34ed2025..03f8b69335d 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -193,6 +193,10 @@ Release 2.5.0 - UNRELEASED TestContainersMonitor#testContainerKillOnMemoryOverflow. (Anubhav Dhoot via kasha) + YARN-2022. Preempting an Application Master container can be kept as least priority + when multiple applications are marked for preemption by + ProportionalCapacityPreemptionPolicy (Sunil G via mayank) + YARN-2241. ZKRMStateStore: On startup, show nicer messages if znodes already exist. (Robert Kanter via kasha)