From 55086e5778aa204568c667e8bbc7cc6fb3a9bdc2 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Wed, 1 Feb 2012 19:56:26 +0000 Subject: [PATCH] MAPREDUCE-3774. Moved yarn-default.xml to hadoop-yarn-common from hadoop-server-common. svn merge --ignore-ancestry -c 1239291 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239292 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/resources/yarn-default.xml | 0 2 files changed, 3 insertions(+) rename hadoop-mapreduce-project/hadoop-yarn/{hadoop-yarn-server/hadoop-yarn-server-common => hadoop-yarn-common}/src/main/resources/yarn-default.xml (100%) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index dcf0f1ffbf2..bd5d7211e70 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -152,6 +152,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3754. Modified RM UI to filter applications based on state of the applications. (vinodkv) + MAPREDUCE-3774. Moved yarn-default.xml to hadoop-yarn-common from + hadoop-server-common. (Mahadev Konar via vinodkv) + OPTIMIZATIONS MAPREDUCE-3567. Extraneous JobConf objects in AM heap. (Vinod Kumar diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml similarity index 100% rename from hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml rename to hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml