You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by oz...@apache.org on 2014/12/20 15:13:22 UTC

[2/2] hadoop git commit: CHANGES.txt: add YARN-2977

CHANGES.txt: add YARN-2977

(cherry picked from commit 76b0370a27c482caff9498e15ef889d37f413ce7)

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/34190916
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/34190916
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/34190916

Branch: refs/heads/branch-2.6
Commit: 3419091631777ec04dd1a9e2bf24adab2496c5ce
Parents: d79f631
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Sat Dec 20 22:54:48 2014 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Sat Dec 20 23:11:04 2014 +0900

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/34190916/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3eb6fbc..3e3373a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1,5 +1,20 @@
 Hadoop YARN Change Log
 
+Release 2.6.1 - Unreleased
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+    YARN-2977. Fixed intermittent TestNMClient failure.
+    (Junping Du via ozawa)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES