Repository: hadoop Updated Branches: refs/heads/branch-2 cac6fe217 -> fd047702e
YARN-1237. Description for yarn.nodemanager.aux-services in yarn-default.xml is misleading. Contributed by Brahma Reddy Battula. (cherry picked from commit b3bcbaf277ec389ec048a4b5cd59b2e90781a30b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fd047702 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fd047702 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fd047702 Branch: refs/heads/branch-2 Commit: fd047702e435f02e7d7134cb16cfcadc9e377206 Parents: cac6fe2 Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Thu Feb 12 15:17:38 2015 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Thu Feb 12 15:19:54 2015 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fd047702/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c1a82ad..9933bc1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -232,6 +232,9 @@ Release 2.7.0 - UNRELEASED YARN-2683. [YARN-913] registry config options: document and move to core-default. (stevel) + YARN-1237. Description for yarn.nodemanager.aux-services in + yarn-default.xml is misleading. (Brahma Reddy Battula via ozawa) + OPTIMIZATIONS YARN-2990. FairScheduler's delay-scheduling always waits for node-local and http://git-wip-us.apache.org/repos/asf/hadoop/blob/fd047702/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 dcb1492..7d0a530 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 @@ -1071,7 +1071,8 @@ </property> <property> - <description>the valid service name should only contain a-zA-Z0-9_ and can not start with numbers</description> + <description>A comma separated list of services where service name should only + contain a-zA-Z0-9_ and can not start with numbers</description> <name>yarn.nodemanager.aux-services</name> <value></value> <!--<value>mapreduce_shuffle</value>-->
