From d1893c8f5b2d1345ab7b0d1a072c448bbe03c1e1 Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Fri, 30 Mar 2012 13:40:48 +0000 Subject: [PATCH] MAPREDUCE-3916. various issues with running yarn proxyserver (devaraj via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1307413 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../hadoop-yarn-common/src/main/resources/webapps/proxy/.keep | 0 .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 0f58e03369..5a286812b4 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -188,6 +188,8 @@ Release 2.0.0 - UNRELEASED MAPREDUCE-4082. hadoop-mapreduce-client-app's mrapp-generated-classpath file should not be in the module JAR (tucu) + MAPREDUCE-3916. various issues with running yarn proxyserver (devaraj via tucu) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index 0a419a4488..686cb49210 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -477,8 +477,7 @@ The address for the web proxy as HOST:PORT, if this is not - given or if it matches yarn.resourcemanager.address then the proxy will - run as part of the RM + given then the proxy will run as part of the RM yarn.web-proxy.address