Repository: hadoop Updated Branches: refs/heads/branch-2 3b03ea6b5 -> d57f2b9de
Updated CHANGES.txt to move YARN-2682 to branch-2.6 (cherry picked from commit 071c925c7dffbb825884a5df5a0104e7793b30fc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d57f2b9d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d57f2b9d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d57f2b9d Branch: refs/heads/branch-2 Commit: d57f2b9deaed73c618a72859d6bb5ad78264a214 Parents: 3b03ea6 Author: Jian He <[email protected]> Authored: Thu Oct 23 22:27:25 2014 -0700 Committer: Jian He <[email protected]> Committed: Thu Oct 23 22:28:23 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/d57f2b9d/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index dfcdd31..2e191be 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -23,10 +23,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 @@ -358,6 +354,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)
