From a85451c8d22b81c36329d7f6e19fa117dcedccad Mon Sep 17 00:00:00 2001
From: Giovanni Matteo Fumarola <gifuma@apache.org>
Date: Tue, 21 May 2019 11:25:30 -0700
Subject: [PATCH] YARN-9575. Fix TestYarnConfigurationFields testcase failing.
 Contributed by Prabhu Joseph.

---
 .../src/main/resources/yarn-default.xml                | 10 ----------
 .../src/site/markdown/yarn-service/Configurations.md   |  1 +
 2 files changed, 1 insertion(+), 10 deletions(-)

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 87c2f132ea7..9741f6c36b1 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
@@ -4211,14 +4211,4 @@
     <name>yarn.resourcemanager.activities-manager.app-activities.max-queue-length</name>
     <value>1000</value>
   </property>
-
-  <property>
-    <description>
-      Comma separated extra class path parameters for yarn services AM.
-      These path elements will be appended to the end of the YARN service AM
-      classpath.
-    </description>
-    <name>yarn.service.classpath</name>
-    <value></value>
-  </property>
 </configuration>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Configurations.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Configurations.md
index 4785f39b265..53ffa07ab43 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Configurations.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Configurations.md
@@ -131,6 +131,7 @@ The above config allows the service AM to be retried a maximum of 10 times.
 |yarn.service.log.exclude-pattern | Regex expression for excluding log files by name when aggregating the logs after the application completes. If the log file name matches both include and exclude pattern, this file will be excluded (default does not exclude any files).|
 |yarn.service.rolling-log.include-pattern | Regex expression for including log files by name when aggregating the logs while app is running.|
 |yarn.service.rolling-log.exclude-pattern | Regex expression for excluding log files by name when aggregating the logs while app is running. If the log file name matches both include and exclude pattern, this file will be excluded.|
+|yarn.service.classpath | Comma separated extra class path parameters for yarn services AM. These path elements will be appended to the end of the YARN service AM classpath. |
 
 ### Component-level configuration properties
 Component-level service AM configuration properties can be specified either in the cluster `yarn-site.xml` at the global level (effectively overriding the default values system-wide), specified per service in the `properties` field of the `Configuration` object, or specified per component in the `properties` field of the component's `Configuration` object.