Repository: ambari Updated Branches: refs/heads/trunk 6a6f55d66 -> c0607621b
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/c0607621 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0607621 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0607621 Branch: refs/heads/trunk Commit: c0607621bd5c91d6ab50f87fa0753ea5e1dc51cb Parents: 6a6f55d Author: Bhuvnesh Chaudhary <[email protected]> Authored: Mon May 2 10:05:23 2016 -0700 Committer: Bhuvnesh Chaudhary <[email protected]> Committed: Mon May 2 10:05:23 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c0607621/ambari-web/app/controllers/wizard.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js index 64ee3dd..380115b 100644 --- a/ambari-web/app/controllers/wizard.js +++ b/ambari-web/app/controllers/wizard.js @@ -925,11 +925,12 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM } var configProperty = App.config.createDefaultConfig( _configProperties.get('name'), + _configProperties.get('serviceName'), _configProperties.get('filename'), _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 = '';
