ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [30/50] [abbrv] ambari git commit: AMBARI-18908. Ambari Kerberos Identity not displayed in the Configured Identities page of Enable Kerberos Wizard (akovalenko)
Date Thu, 17 Nov 2016 17:13:46 GMT
AMBARI-18908. Ambari Kerberos Identity not displayed in the Configured Identities page of Enable
Kerberos Wizard (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7956950c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7956950c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7956950c

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 7956950c69279350df0b5cb6c9228f6788cce4b0
Parents: b70c78b
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Wed Nov 16 17:38:59 2016 +0200
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Wed Nov 16 18:28:39 2016 +0200

----------------------------------------------------------------------
 .../app/controllers/main/admin/kerberos/step4_controller.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7956950c/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
index 7584c24..eebe133 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
@@ -47,7 +47,7 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
       // when configurations were stored no need to apply recommendations again
       if (App.get('supports.kerberosStackAdvisor') && !stored.length) {
         self.bootstrapRecommendationPayload(kerberosDescriptor).then(function(recommendations)
{
-          self.loadServerSideConfigsRecommendations(recommendations).done(function() {
+          self.loadServerSideConfigsRecommendations(recommendations).always(function() {
             self.applyServiceConfigs(stepConfigs);
           });
         });
@@ -209,7 +209,7 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
     var self = this;
     // stored configs from previous steps (Configure Kerberos or Customize Services for ASW)
     var storedServiceConfigs = this.get('wizardController.content.serviceConfigProperties');
-    var installedServiceNames = ['Cluster'].concat(App.Service.find().mapProperty('serviceName'));
+    var installedServiceNames = ['Cluster', 'AMBARI'].concat(App.Service.find().mapProperty('serviceName'));
     var configProperties = configs.slice(0);
     var siteProperties = App.configsCollection.getAll();
     var realmValue;


Mime
View raw message