YARN-2216. Fixed the change log.

(cherry picked from commit 5f9a0dd8d959e6c03f611c6f073b27a8d73ad418)

Conflicts:
	hadoop-yarn-project/CHANGES.txt

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