Browse Source

AMBARI-1527: Allow loading of custom configurations in step7 : "Customize Services" (regression). (jaimin)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1451447 13f79535-47bb-0310-9956-ffa450edef68
Jaimin Jetly 12 years ago
parent
commit
a63ecf30f3
2 changed files with 4 additions and 1 deletions
  1. 3 0
      CHANGES.txt
  2. 1 1
      ambari-web/app/controllers/wizard/step7_controller.js

+ 3 - 0
CHANGES.txt

@@ -387,6 +387,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1527. Allow loading of custom configurations in 
+ step7 : "Customize Services" (regression). (jaimin)
+
  AMBARI-1525. ambari.properties file has an invalid character causing
  ambari-server setup to fail. (jaimin)
 

+ 1 - 1
ambari-web/app/controllers/wizard/step7_controller.js

@@ -76,7 +76,7 @@ App.WizardStep7Controller = Em.Controller.extend({
     var serviceConfigs = this.get('serviceConfigs');
     var advancedConfig = this.get('content.advancedServiceConfig') || [];
     this.loadAdvancedConfig(serviceConfigs, advancedConfig);
-    //////this.loadCustomConfig();
+    this.loadCustomConfig();
     this.renderServiceConfigs(serviceConfigs);
     var storedServices = this.get('content.serviceConfigProperties');
     if (storedServices) {