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 ji...@apache.org on 2014/10/24 07:27:56 UTC

git commit: Updated CHANGES.txt to move YARN-2682 to branch-2.6

Repository: hadoop
Updated Branches:
  refs/heads/trunk 0f3b6900b -> 071c925c7


Updated CHANGES.txt to move YARN-2682 to branch-2.6


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

Branch: refs/heads/trunk
Commit: 071c925c7dffbb825884a5df5a0104e7793b30fc
Parents: 0f3b690
Author: Jian He <ji...@apache.org>
Authored: Thu Oct 23 22:27:25 2014 -0700
Committer: Jian He <ji...@apache.org>
Committed: Thu Oct 23 22:27:25 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/071c925c/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index bc93be1..7c76688 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -50,10 +50,6 @@ 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
@@ -388,6 +384,10 @@ Release 2.6.0 - UNRELEASED
     YARN-2709. Made timeline client getDelegationToken API retry if ConnectException
     happens. (Li Lu via zjshen)
 
+    YARN-2682. Updated WindowsSecureContainerExecutor to not use
+    DefaultContainerExecutor#getFirstApplicationDir and use getWorkingDir()
+    instead. (Zhihai Xu via jianhe)
+
     YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and
     made related MR changes. (Jian He via zjshen)