Repository: hadoop
Updated Branches:
  refs/heads/branch-2 a78f1f8da -> 10110b6ea


Moved YARN-2682 from 2.6 to 2.7 in CHANGES.txt
(cherry picked from commit 72093fd8cb9865a27a96163f31d03d6813ce267f)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10110b6e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10110b6e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10110b6e

Branch: refs/heads/branch-2
Commit: 10110b6eae6b58fcd761a73fd11a3f2636af0315
Parents: a78f1f8
Author: Jian He <[email protected]>
Authored: Thu Oct 16 19:02:44 2014 -0700
Committer: Jian He <[email protected]>
Committed: Thu Oct 16 19:03:29 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/10110b6e/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 64699a1..2778574 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -23,6 +23,10 @@ Release 2.7.0 - UNRELEASED
     YARN-2641. Decommission nodes on -refreshNodes instead of next 
     NM-RM heartbeat. (Zhihai Xu via kasha)
 
+    YARN-2682. Updated WindowsSecureContainerExecutor to not use
+    DefaultContainerExecutor#getFirstApplicationDir and use getWorkingDir()
+    instead. (Zhihai Xu via jianhe)
+
   OPTIMIZATIONS
 
   BUG FIXES
@@ -330,10 +334,6 @@ Release 2.6.0 - UNRELEASED
     YARN-2621. Simplify the output when the user doesn't have the access for
     getDomain(s). (Zhijie Shen via jianhe)
 
-    YARN-2682. Updated WindowsSecureContainerExecutor to not use
-    DefaultContainerExecutor#getFirstApplicationDir and use getWorkingDir()
-    instead. (Zhihai Xu via jianhe) 
-
   OPTIMIZATIONS
 
   BUG FIXES

Reply via email to