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 2013/03/01 02:11:18 UTC
svn commit: r1451447 - in /incubator/ambari/trunk: CHANGES.txt
ambari-web/app/controllers/wizard/step7_controller.js
Author: jaimin
Date: Fri Mar 1 01:11:18 2013
New Revision: 1451447
URL: http://svn.apache.org/r1451447
Log:
AMBARI-1527: Allow loading of custom configurations in step7 : "Customize Services" (regression). (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1451447&r1=1451446&r2=1451447&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Mar 1 01:11:18 2013
@@ -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)
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js?rev=1451447&r1=1451446&r2=1451447&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js Fri Mar 1 01:11:18 2013
@@ -76,7 +76,7 @@ App.WizardStep7Controller = Em.Controlle
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) {