From f0f5e3c0751bcadcacd6d91e2c5504803ec3d0a5 Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@apache.org>
Date: Fri, 8 May 2015 17:20:09 +0000
Subject: [PATCH] =?UTF-8?q?YARN-20.=20More=20information=20for=20yarn.reso?=
 =?UTF-8?q?urcemanager.webapp.address=20in=20yarn-default.xml=20(Bartosz?=
 =?UTF-8?q?=20=C5=81ugowski=20vai=20tgraves)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hadoop-yarn-project/CHANGES.txt                      |  3 +++
 .../src/main/resources/yarn-default.xml              | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b72c648bc1..eb27152766 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -196,6 +196,9 @@ Release 2.8.0 - UNRELEASED
 
     YARN-2784. Make POM project names consistent. (Rohith via devaraj)
 
+    YARN-20. More information for "yarn.resourcemanager.webapp.address" in 
+    yarn-default.xml (Bartosz Ługowski vai tgraves)
+
   OPTIMIZATIONS
 
     YARN-3339. TestDockerContainerExecutor should pull a single image and not
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 5d0f07d8f5..e1e0ebd3d7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -111,13 +111,21 @@
   </property>
 
   <property>
-    <description>The http address of the RM web application.</description>
+    <description>
+      The http address of the RM web application.
+      If only a host is provided as the value,
+      the webapp will be served on a random port.
+    </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>
+    <description>
+      The https address of the RM web application.
+      If only a host is provided as the value,
+      the webapp will be served on a random port.
+    </description>
     <name>yarn.resourcemanager.webapp.https.address</name>
     <value>${yarn.resourcemanager.hostname}:8090</value>
   </property>