From fd047702e435f02e7d7134cb16cfcadc9e377206 Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ozawa <ozawa@apache.org>
Date: Thu, 12 Feb 2015 15:17:38 +0900
Subject: [PATCH] YARN-1237. Description for yarn.nodemanager.aux-services in
 yarn-default.xml is misleading. Contributed by Brahma Reddy Battula.

(cherry picked from commit b3bcbaf277ec389ec048a4b5cd59b2e90781a30b)
---
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../hadoop-yarn-common/src/main/resources/yarn-default.xml     | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c1a82ad7d33..9933bc11e30 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 
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 dcb14929417..7d0a530e136 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>-->