Repository: hadoop Updated Branches: refs/heads/branch-2 ed320da2b -> d3193fd1d
Move YARN-2918 from 2.8.0 to 2.7.1 (cherry picked from commit 03f897fd1a3779251023bae358207069b89addbf) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d3193fd1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d3193fd1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d3193fd1 Branch: refs/heads/branch-2 Commit: d3193fd1d7395bf3e7c8dfa70d1aec08b0f147e6 Parents: ed320da Author: Wangda Tan <wan...@apache.org> Authored: Wed May 20 13:49:10 2015 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Wed May 20 13:50:11 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3193fd1/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b3ccc35..6fc1f53 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -340,9 +340,6 @@ Release 2.8.0 - UNRELEASED YARN-3584. Fixed attempt diagnostics format shown on the UI. (nijel via jianhe) - YARN-2918. RM should not fail on startup if queue's configured labels do - not exist in cluster-node-labels. (Wangda Tan via jianhe) - YARN-1832. Fix wrong MockLocalizerStatus#equals implementation. (Hong Zhiguo via aajisaka) @@ -484,6 +481,9 @@ Release 2.7.1 - UNRELEASED YARN-3677. Fix findbugs warnings in yarn-server-resourcemanager. (Vinod Kumar Vavilapalli via ozawa) + YARN-2918. RM should not fail on startup if queue's configured labels do + not exist in cluster-node-labels. (Wangda Tan via jianhe) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES