Repository: hadoop
Updated Branches:
refs/heads/branch-2 b51c0288d -> ebaf6220f
YARN-2216. Fixed the change log.
(cherry picked from commit 5f9a0dd8d959e6c03f611c6f073b27a8d73ad418)
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ebaf6220
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ebaf6220
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ebaf6220
Branch: refs/heads/branch-2
Commit: ebaf6220fe3b78425603a2f26ffdecfb4bdc4aa5
Parents: b51c028
Author: Zhijie Shen <[email protected]>
Authored: Mon Feb 2 12:11:36 2015 -0800
Committer: Zhijie Shen <[email protected]>
Committed: Mon Feb 2 12:16:07 2015 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ebaf6220/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 115538f..596e143 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
