From da3e84beb98d530ba4071a2bb151d8ba80033c94 Mon Sep 17 00:00:00 2001
From: Jian He <jianhe@apache.org>
Date: Mon, 13 Oct 2014 14:19:28 -0700
Subject: [PATCH] Missing Changes.txt for YARN-2308 (cherry picked from commit
 178bc505da5d06d591a19aac13c040c6a9cf28ad)

---
 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 37bca0af5b1..e00f5ec751a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -573,6 +573,10 @@ Release 2.6.0 - UNRELEASED
     YARN-2377. Localization exception stack traces are not passed as
     diagnostic info (Gera Shegalov via jlowe)
 
+    YARN-2308. Changed CapacityScheduler to explicitly throw exception if the
+    queue to which the apps were submitted is changed across RM restart.
+    (Craig Welch & Chang Li via jianhe)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES