Repository: ambari Updated Branches: refs/heads/trunk f8aecbba1 -> acd99827e
Revert "AMBARI-16147: Ambari Web Service installation does not comply with Final Attribute (goutam tadi via bhuvnesh2703)" This reverts commit c0607621bd5c91d6ab50f87fa0753ea5e1dc51cb. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/acd99827 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/acd99827 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/acd99827 Branch: refs/heads/trunk Commit: acd99827ed85ff0cf2665f14940d83d1783e4e8a Parents: f8aecbb Author: Jaimin Jetly <[email protected]> Authored: Mon May 2 18:21:26 2016 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Mon May 2 18:21:26 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/acd99827/ambari-web/app/controllers/wizard.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js index 380115b..64ee3dd 100644 --- a/ambari-web/app/controllers/wizard.js +++ b/ambari-web/app/controllers/wizard.js @@ -925,12 +925,11 @@ 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', 'serviceName', 'isUserProperty', 'value']); + configProperty = App.config.mergeStaticProperties(configProperty, _configProperties, ['name', 'filename']); if (this.isExcludedConfig(configProperty)) { configProperty.value = '';
