From 83c72ce9f608b6eaeb7045a7687f0f65ed9870e8 Mon Sep 17 00:00:00 2001
From: Zhihai Xu <zxu@apache.org>
Date: Tue, 15 Dec 2015 01:47:41 -0800
Subject: [PATCH] Update CHANGES.txt to add YARN-3857 and YARN-3535 to
 branch-2.6

(cherry picked from commit 0c3a53e5a978140e56b9ebbc82c8d04fc978e640)
---
 hadoop-yarn-project/CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 64dabfd3149..cedcc50e3d8 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1990,6 +1990,12 @@ Release 2.6.4 - UNRELEASED
 
   BUG FIXES
 
+  YARN-3857: Memory leak in ResourceManager with SIMPLE mode.
+  (mujunchao via zxu)
+
+  YARN-3535. Scheduler must re-request container resources when RMContainer transitions
+  from ALLOCATED to KILLED (rohithsharma and peng.zhang via asuresh)
+
 Release 2.6.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES