ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-12840. Kerberos wizard sets AMS-HBase principals and keytabs as HBase duplicates. (jaimin)
Date Thu, 20 Aug 2015 23:51:19 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 9350f9e75 -> c9d8255c5


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/c9d8255c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9d8255c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9d8255c

Branch: refs/heads/branch-2.1
Commit: c9d8255c5e65200946b6d502c74f7b7fcce581d2
Parents: 9350f9e
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Thu Aug 20 16:49:48 2015 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Thu Aug 20 16:51:05 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/c9d8255c/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/c9d8255c/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/c9d8255c/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index abd1e08..23707c27 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1516,7 +1516,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);
         }


Mime
View raw message