ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhuvnesh2...@apache.org
Subject ambari git commit: AMBARI-16147: Ambari Web Service installation does not comply with Final Attribute (goutam tadi via bhuvnesh2703)
Date Mon, 02 May 2016 17:03:17 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 97b754139 -> 52dfc2e39


AMBARI-16147: Ambari Web Service installation does not comply with Final Attribute (goutam
tadi via bhuvnesh2703)


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

Branch: refs/heads/branch-2.2
Commit: 52dfc2e397ac79c13c7b14333d52a4b317248f1b
Parents: 97b7541
Author: Bhuvnesh Chaudhary <bchaudhary@pivotal.io>
Authored: Mon May 2 10:06:51 2016 -0700
Committer: Bhuvnesh Chaudhary <bchaudhary@pivotal.io>
Committed: Mon May 2 10:06:51 2016 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/52dfc2e3/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index fdf29f3..08ff061 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -884,7 +884,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
           _configProperties.get('isUserProperty'),
           {value: _configProperties.get('value')}
         );
-        configProperty = App.config.mergeStaticProperties(configProperty, _configProperties,
['name', 'filename']);
+        configProperty = App.config.mergeStaticProperties(configProperty, _configProperties,
[], ['name', 'filename', 'serviceName', 'isUserProperty', 'value']);
 
         if (this.isExcludedConfig(configProperty)) {
           configProperty.value = '';


Mime
View raw message