Author: vinodkv
Date: Wed Oct 2 06:31:53 2013
New Revision: 1528313
URL: http://svn.apache.org/r1528313
Log:
YARN-1260. Added webapp.http.address to yarn-default.xml so that default
install with https enabled doesn't have broken link on NM UI. Contributed by
Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1528312 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1528313&r1=1528312&r2=1528313&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Oct 2
06:31:53 2013
@@ -102,6 +102,10 @@ Release 2.1.2 - UNRELEASED
YARN-1262. TestApplicationCleanup relies on all containers assigned in a
single heartbeat (Karthik Kambatla via Sandy Ryza)
+ YARN-1260. Added webapp.http.address to yarn-default.xml so that default
+ install with https enabled doesn't have broken link on NM UI. (Omkar Vinit
+ Joshi via vinodkv)
+
Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1528313&r1=1528312&r2=1528313&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Wed Oct 2 06:31:53 2013
@@ -100,12 +100,18 @@
</property>
<property>
- <description>The address of the RM web application.</description>
+ <description>The http address of the RM web application.</description>
<name>yarn.resourcemanager.webapp.address</name>
<value>${yarn.resourcemanager.hostname}:8088</value>
</property>
<property>
+ <description>The https adddress of the RM web application.</description>
+ <name>yarn.resourcemanager.webapp.https.address</name>
+ <value>${yarn.resourcemanager.hostname}:8090</value>
+ </property>
+
+ <property>
<name>yarn.resourcemanager.resource-tracker.address</name>
<value>${yarn.resourcemanager.hostname}:8031</value>
</property>
