From ebaf6220fe3b78425603a2f26ffdecfb4bdc4aa5 Mon Sep 17 00:00:00 2001
From: Zhijie Shen <zjshen@apache.org>
Date: Mon, 2 Feb 2015 12:11:36 -0800
Subject: [PATCH] YARN-2216. Fixed the change log.

(cherry picked from commit 5f9a0dd8d959e6c03f611c6f073b27a8d73ad418)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
---
 hadoop-yarn-project/CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 115538f578b..596e143179e 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1674,6 +1674,9 @@ Release 2.5.0 - 2014-08-11
     YARN-1726. ResourceSchedulerWrapper broken due to AbstractYarnScheduler.
     (Wei Yan via kasha)
 
+    YARN-2216. TestRMApplicationHistoryWriter sometimes fails in trunk.
+    (Zhijie Shen via xgong)
+
 Release 2.4.1 - 2014-06-23 
 
   INCOMPATIBLE CHANGES