You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2013/06/07 19:54:10 UTC
svn commit: r1490755 - in
/incubator/ambari/branches/branch-1.4.0/ambari-web/app:
controllers/wizard/step8_controller.js data/service_configs.js
utils/config.js
Author: srimanth
Date: Fri Jun 7 17:54:09 2013
New Revision: 1490755
URL: http://svn.apache.org/r1490755
Log:
AMBARI-2318. Same section/properties can be configured in YARN and MR2. (Andrii Tkach via srimanth)
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js
incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/config.js
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/wizard/step8_controller.js?rev=1490755&r1=1490754&r2=1490755&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/wizard/step8_controller.js Fri Jun 7 17:54:09 2013
@@ -28,7 +28,9 @@ App.WizardStep8Controller = Em.Controlle
configs: [],
globals: [],
ajaxQueue: [],
- configMapping: App.config.get('configMapping').all(),
+ configMapping: function(){
+ return App.config.get('configMapping').all();
+ }.property('App.config.configMapping'),
slaveComponentConfig: null,
isSubmitDisabled: false,
hasErrorOccurred: false,
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js?rev=1490755&r1=1490754&r2=1490755&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js Fri Jun 7 17:54:09 2013
@@ -50,7 +50,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName : 'Capacity Scheduler', isCapacityScheduler : true, isCustomView: true, siteFileName: 'capacity-scheduler.xml', siteFileNames: ['capacity-scheduler.xml', 'mapred-queue-acls.xml'], canAddProperty: true}),
App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
],
- sites: ['global', 'core-site', 'mapred-site', 'capacity-scheduler', 'mapred-queue-acls'],
+ sites: ['global', 'mapred-site', 'capacity-scheduler', 'mapred-queue-acls'],
configs: []
},
@@ -64,7 +64,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
],
- sites: ['global', 'core-site', 'mapred-site', 'mapred-queue-acls'],
+ sites: ['global', 'mapred-site', 'mapred-queue-acls'],
configs: []
},
@@ -80,7 +80,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedYARNSite', displayName : 'Custom yarn-site.xml', siteFileName: 'yarn-site.xml', canAddProperty: true})
],
- sites: ['global', 'core-site', 'yarn-site', 'capacity-scheduler'],
+ sites: ['global', 'yarn-site', 'capacity-scheduler'],
configs: []
},
Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/config.js?rev=1490755&r1=1490754&r2=1490755&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/config.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/utils/config.js Fri Jun 7 17:54:09 2013
@@ -201,10 +201,6 @@ App.config = Em.Object.create({
serviceConfigObj.index = configsPropertyDef.index;
serviceConfigObj.belongsToService = configsPropertyDef.belongsToService;
}
- // MAPREDUCE contains core-site properties but doesn't show them
- if(serviceConfigObj.serviceName === 'MAPREDUCE' && serviceConfigObj.filename === 'core-site.xml'){
- serviceConfigObj.isVisible = false;
- }
if (_tag.siteName === 'global') {
if (configsPropertyDef) {
this.handleSpecialProperties(serviceConfigObj);