Repository: hadoop Updated Branches: refs/heads/branch-2 68d85e92b -> 638feaaa3
YARN-20. More information for yarn.resourcemanager.webapp.address in yarn-default.xml (Bartosz Åugowski vai tgraves) (cherry picked from commit f0f5e3c0751bcadcacd6d91e2c5504803ec3d0a5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/638feaaa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/638feaaa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/638feaaa Branch: refs/heads/branch-2 Commit: 638feaaa354243bb53f480c161ffefee8a8fbc50 Parents: 68d85e9 Author: Thomas Graves <tgra...@apache.org> Authored: Fri May 8 17:20:09 2015 +0000 Committer: Thomas Graves <tgra...@apache.org> Committed: Fri May 8 17:22:33 2015 +0000 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../src/main/resources/yarn-default.xml | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/638feaaa/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 25625b7..c2f8fb8 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -151,6 +151,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/638feaaa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- 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 5d0f07d..e1e0ebd 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>