From 8376ea3297a3eab33df27454b18cf215cfb7c6ff Mon Sep 17 00:00:00 2001
From: rohithsharmaks <rohithsharmaks@apache.org>
Date: Thu, 23 Jul 2015 00:28:24 +0530
Subject: [PATCH] YARN-3954. Fix
 TestYarnConfigurationFields#testCompareConfigurationClassAgainstXml. (varun
 saxena via rohithsharmaks)

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

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f751862525..eb52745604 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -656,6 +656,9 @@ Release 2.8.0 - UNRELEASED
     YARN-3932. SchedulerApplicationAttempt#getResourceUsageReport and UserInfo 
     should based on total-used-resources. (Bibin A Chundatt via wangda)
 
+    YARN-3954. Fix TestYarnConfigurationFields#testCompareConfigurationClassAgainstXml.
+    (varun saxena via rohithsharmaks)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
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 2edeef0b46..d586f51ff4 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
@@ -2131,4 +2131,14 @@
     <value>false</value>
   </property>
 
+  <property>
+    <description>
+    Defines maximum application priority in a cluster.
+    If an application is submitted with a priority higher than this value, it will be
+    reset to this maximum value.
+    </description>
+    <name>yarn.cluster.max-application-priority</name>
+    <value>0</value>
+  </property>
+
 </configuration>