From d0285d1ad66bf243ca5eabe7865e9c95e9f4eddd Mon Sep 17 00:00:00 2001 From: "Arun C. Murthy" Date: Thu, 13 Nov 2014 10:27:47 -0800 Subject: [PATCH] YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1. (cherry picked from commit 81dc0ac6dcf2f34ad607da815ea0144f178691a9) --- hadoop-yarn-project/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 92961a21e58..0671ffc6760 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -26,9 +26,6 @@ Release 2.7.0 - UNRELEASED YARN-1979. TestDirectoryCollection fails when the umask is unusual. (Vinod Kumar Vavilapalli and Tsuyoshi OZAWA via junping_du) - YARN-2635. TestRM, TestRMRestart, TestClientToAMTokens should run - with both CS and FS. (Wei Yan and kasha via kasha) - YARN-2641. Decommission nodes on -refreshNodes instead of next NM-RM heartbeat. (Zhihai Xu via kasha) @@ -429,6 +426,9 @@ Release 2.6.0 - 2014-11-15 YARN-2818. Removed the now unnecessary user entity injection from Timeline service given we now have domains. (Zhijie Shen via vinodkv) + YARN-2635. TestRM, TestRMRestart, TestClientToAMTokens should run + with both CS and FS. (Wei Yan and kasha via kasha) + OPTIMIZATIONS BUG FIXES