Repository: ambari Updated Branches: refs/heads/branch-2.2 1c43db082 -> 164c2f977
AMBARI-16147: Ambari Web Service installation does not comply with Final Attribute (goutham 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/164c2f97 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/164c2f97 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/164c2f97 Branch: refs/heads/branch-2.2 Commit: 164c2f977505e72cf71c0997865013bc7ac9aa52 Parents: 1c43db0 Author: Bhuvnesh Chaudhary <[email protected]> Authored: Wed May 4 10:11:01 2016 -0700 Committer: Bhuvnesh Chaudhary <[email protected]> Committed: Wed May 4 10:11:01 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/164c2f97/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 = '';
