You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/08/21 01:50:22 UTC
ambari git commit: AMBARI-12840. Kerberos wizard sets AMS-HBase
principals and keytabs as HBase duplicates. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1.1 41c4e33f6 -> 4c0d15294
AMBARI-12840. Kerberos wizard sets AMS-HBase principals and keytabs as HBase duplicates. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c0d1529
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c0d1529
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c0d1529
Branch: refs/heads/branch-2.1.1
Commit: 4c0d1529469e06dad8e65ba2233f107dd715106a
Parents: 41c4e33
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Aug 20 16:49:48 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Aug 20 16:49:57 2015 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/wizard.js | 1 +
ambari-web/app/mixins/wizard/addSecurityConfigs.js | 2 +-
ambari-web/app/utils/config.js | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c0d1529/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index f67fd7b..b9e863f 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -1230,6 +1230,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
}
return {
name: config.name,
+ filename: config.filename,
value: config.value
};
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c0d1529/ambari-web/app/mixins/wizard/addSecurityConfigs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/addSecurityConfigs.js b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
index 0dc2f40..4111a77 100644
--- a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
+++ b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
@@ -698,7 +698,7 @@ App.AddSecurityConfigs = Em.Mixin.create({
*/
shouldLoadClusterDescriptor: function() {
return App.get('isKerberosEnabled') && !App.router.get('mainAdminKerberosController.defaultKerberosLoaded');
- }.property('App.router.mainAdminKerberosController.securityEnabled', 'App.router.mainAdminKerberosController.defaultKerberosLoaded'),
+ }.property('App.isKerberosEnabled', 'App.router.mainAdminKerberosController.defaultKerberosLoaded'),
/**
* Make request for stack descriptor configs.
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c0d1529/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index dce2d50..70a092f 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1503,7 +1503,7 @@ App.config = Em.Object.create({
mergeStoredValue: function(base, stored) {
if (stored) {
base.forEach(function (p) {
- var sp = stored.findProperty("name", p.name);
+ var sp = stored.filterProperty("filename", p.filename).findProperty("name", p.name);
if (sp) {
p.set("value", sp.value);
}