Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 af940adc9 -> 4d9d51881
  refs/heads/trunk 2c676de09 -> ea1a72bfa


AMBARI-17769. property_description is null for some properties in config page. 
Fix unit test (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d9d5188
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d9d5188
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d9d5188

Branch: refs/heads/branch-2.4
Commit: 4d9d51881eef035492b562721924f6e84b9b0dec
Parents: af940ad
Author: Lisnichenko Dmitro <[email protected]>
Authored: Tue Jul 19 12:11:47 2016 +0300
Committer: Lisnichenko Dmitro <[email protected]>
Committed: Tue Jul 19 12:11:47 2016 +0300

----------------------------------------------------------------------
 .../services/YARN/configuration/capacity-scheduler.xml              | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d9d5188/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
index 40748a2..39fb730 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
@@ -25,7 +25,6 @@
       resources such as Memory, CPU etc. A Java ResourceCalculator class name 
is expected.
     </description>
     
<value>org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator</value>
-    <description/>
     <on-ambari-upgrade add="true"/>
   </property>
   <property>

Reply via email to