You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by tu...@apache.org on 2012/03/30 15:41:41 UTC
svn commit: r1307414 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./
hadoop-yarn/hadoop-yarn-common/src/main/resources/
hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/
Author: tucu
Date: Fri Mar 30 13:41:40 2012
New Revision: 1307414
URL: http://svn.apache.org/viewvc?rev=1307414&view=rev
Log:
Merge -r 1307412:1307413 from trunk to branch. FIXES: MAPREDUCE-3916
Added:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/
- copied from r1307413, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep
- copied unchanged from r1307413, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1307414&r1=1307413&r2=1307414&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri Mar 30 13:41:40 2012
@@ -95,6 +95,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
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1307414&r1=1307413&r2=1307414&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml Fri Mar 30 13:41:40 2012
@@ -477,8 +477,7 @@
<property>
<description>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</description>
+ given then the proxy will run as part of the RM</description>
<name>yarn.web-proxy.address</name>
<value/>
</property>