You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/06/17 23:35:20 UTC
svn commit: r1493949 - in /incubator/ambari/trunk:
ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HDFS/configuration/global.xml
ambari-web/app/utils/config.js
Author: jaimin
Date: Mon Jun 17 21:35:20 2013
New Revision: 1493949
URL: http://svn.apache.org/r1493949
Log:
AMBARI-2408. Kerberos globals are shown in HDFS config page during install. (jaimin)
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HDFS/configuration/global.xml
incubator/ambari/trunk/ambari-web/app/utils/config.js
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HDFS/configuration/global.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HDFS/configuration/global.xml?rev=1493949&r1=1493948&r2=1493949&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HDFS/configuration/global.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HDFS/configuration/global.xml Mon Jun 17 21:35:20 2013
@@ -172,12 +172,7 @@
<value>/etc/security/keytabs</value>
<description>Kerberos keytab path.</description>
</property>
-
- <property>
- <name>keytab_path</name>
- <value>/etc/security/keytabs</value>
- <description>KeyTab Directory.</description>
- </property>
+
<property>
<name>namenode_formatted_mark_dir</name>
<value>/var/run/hadoop/hdfs/namenode/formatted/</value>
Modified: incubator/ambari/trunk/ambari-web/app/utils/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/config.js?rev=1493949&r1=1493948&r2=1493949&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/config.js Mon Jun 17 21:35:20 2013
@@ -297,7 +297,6 @@ App.config = Em.Object.create({
* (/^\s+$/.test(_config.value)) { _config.isRequired = false; }
*/
_config.isRequired = true;
- _config.isVisible = true;
_config.displayType = 'advanced';
serviceConfigs.push(_config);
}
@@ -551,11 +550,13 @@ App.config = Em.Object.create({
if (data.items.length) {
data.items.forEach(function (item) {
item = item.StackConfigurations;
+ item.isVisible = item.type !== 'global.xml';
properties.push({
serviceName: item.service_name,
name: item.property_name,
value: item.property_value,
description: item.property_description,
+ isVisible: item.isVisible,
filename: item.filename || item.type
});
}, this);