Repository: ambari Updated Branches: refs/heads/branch-2.2 52dfc2e39 -> d24e3d02f
Revert "AMBARI-16147: Ambari Web Service installation does not comply with Final Attribute (goutam tadi via bhuvnesh2703)" This reverts commit 52dfc2e397ac79c13c7b14333d52a4b317248f1b. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d24e3d02 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d24e3d02 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d24e3d02 Branch: refs/heads/branch-2.2 Commit: d24e3d02f8d12eee2d99f8aaf27ba7150662820e Parents: 52dfc2e Author: Jaimin Jetly <[email protected]> Authored: Mon May 2 18:32:57 2016 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Mon May 2 18:32:57 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/d24e3d02/ambari-web/app/controllers/wizard.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js index 08ff061..fdf29f3 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', 'serviceName', 'isUserProperty', 'value']); + configProperty = App.config.mergeStaticProperties(configProperty, _configProperties, ['name', 'filename']); if (this.isExcludedConfig(configProperty)) { configProperty.value = '';
