You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/01/24 15:30:33 UTC
git commit: AMBARI-4411 Customize Services: rename Custom *-log4j.xml
labels as Custom log4j.properties (or Custom *-log4j). (atkach)
Updated Branches:
refs/heads/trunk 33a0ec85a -> e42416421
AMBARI-4411 Customize Services: rename Custom *-log4j.xml labels as Custom log4j.properties (or Custom *-log4j). (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4241642
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4241642
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4241642
Branch: refs/heads/trunk
Commit: e42416421cc59a8b6b6e0dd5e5edaacd06956d5b
Parents: 33a0ec8
Author: atkach <at...@hortonworks.com>
Authored: Fri Jan 24 16:30:30 2014 +0200
Committer: atkach <at...@hortonworks.com>
Committed: Fri Jan 24 16:30:30 2014 +0200
----------------------------------------------------------------------
ambari-web/app/data/service_configs.js | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4241642/ambari-web/app/data/service_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js
index b8947c6..142e3b4 100644
--- a/ambari-web/app/data/service_configs.js
+++ b/ambari-web/app/data/service_configs.js
@@ -37,7 +37,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedCoreSite', displayName : 'Custom core-site.xml', siteFileName: 'core-site.xml', canAddProperty: true}),
App.ServiceConfigCategory.create({ name: 'AdvancedHDFSSite', displayName : 'Custom hdfs-site.xml', siteFileName: 'hdfs-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedHDFSLog4j', displayName : 'Custom hdfs-log4j.xml', siteFileName: 'hdfs-log4j.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'AdvancedHDFSLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hdfs-log4j.xml', canAddProperty: true})
],
sites: ['global', 'core-site', 'hdfs-site', 'hdfs-log4j'],
configs: []
@@ -64,7 +64,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom mapred-log4j.xml', siteFileName: 'mapred-log4j.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom log4j.properties', siteFileName: 'mapred-log4j.xml', canAddProperty: true})
],
sites: ['global', 'mapred-site', 'mapred-queue-acls', 'mapred-log4j'],
configs: []
@@ -84,7 +84,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName : 'Scheduler', isCapacityScheduler : true, isCustomView: true, siteFileName: 'capacity-scheduler.xml', siteFileNames: ['capacity-scheduler.xml', 'mapred-queue-acls.xml'], canAddProperty: App.supports.capacitySchedulerUi}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedYARNSite', displayName : 'Custom yarn-site.xml', siteFileName: 'yarn-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedYARNLog4j', displayName : 'Custom yarn-log4j.xml', siteFileName: 'yarn-log4j.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'AdvancedYARNLog4j', displayName : 'Custom log4j.properties', siteFileName: 'yarn-log4j.xml', canAddProperty: true})
],
sites: ['global', 'yarn-site', 'capacity-scheduler', 'yarn-log4j'],
configs: []
@@ -101,7 +101,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom mapred-log4j.xml', siteFileName: 'mapred-log4j.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom log4j.properties', siteFileName: 'mapred-log4j.xml', canAddProperty: true})
],
sites: ['global', 'mapred-site', 'mapred-queue-acls', 'mapred-log4j'],
configs: []
@@ -115,8 +115,8 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName : 'Hive Metastore'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedHiveSite', displayName : 'Custom hive-site.xml', siteFileName: 'hive-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedHiveLog4j', displayName : 'Custom hive-log4j.xml', siteFileName: 'hive-log4j.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedHiveExecLog4j', displayName : 'Custom hive-exec-log4j.xml', siteFileName: 'hive-exec-log4j.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'AdvancedHiveLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hive-log4j.xml', canAddProperty: true}),
+ App.ServiceConfigCategory.create({ name: 'AdvancedHiveExecLog4j', displayName : 'Custom hive-exec-log4j', siteFileName: 'hive-exec-log4j.xml', canAddProperty: true})
],
sites: ['global', 'hive-site', 'hive-log4j', 'hive-log4j-exec'],
configs: []
@@ -145,7 +145,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedHbaseSite', displayName : 'Custom hbase-site.xml', siteFileName: 'hbase-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedHbaseLog4j', displayName : 'Custom hbase-log4j.xml', siteFileName: 'hbase-log4j.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'AdvancedHbaseLog4j', displayName : 'Custom log4j.properties', siteFileName: 'hbase-log4j.xml', canAddProperty: true})
],
sites: ['global', 'hbase-site', 'hbase-log4j'],
configs: []
@@ -157,7 +157,7 @@ module.exports = [
configCategories: [
App.ServiceConfigCategory.create({ name: 'ZooKeeper Server', displayName : 'ZooKeeper Server'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
- App.ServiceConfigCategory.create({ name: 'AdvancedZooLog4j', displayName : 'Custom zoo-log4j.xml', siteFileName: 'zoo-log4j.xml', canAddProperty: true}),
+ App.ServiceConfigCategory.create({ name: 'AdvancedZooLog4j', displayName : 'Custom log4j.properties', siteFileName: 'zoo-log4j.xml', canAddProperty: true}),
App.ServiceConfigCategory.create({ name: 'AdvancedZooCfg', displayName : 'Custom zoo.cfg', siteFileName: 'zoo.cfg', canAddProperty: true})
],
sites: ['global', 'zoo-log4j', 'zoo.cfg'],
@@ -172,7 +172,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Oozie Server', displayName : 'Oozie Server'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedOozieSite', displayName : 'Custom oozie-site.xml', siteFileName: 'oozie-site.xml', canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'AdvancedOozieLog4j', displayName : 'Custom oozie-log4j.xml', siteFileName: 'oozie-log4j.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'AdvancedOozieLog4j', displayName : 'Custom log4j.properties', siteFileName: 'oozie-log4j.xml', canAddProperty: true})
],
sites: ['global', 'oozie-site', 'oozie-log4j'],
configs: []
@@ -215,7 +215,7 @@ module.exports = [
displayName: 'Pig',
configCategories: [
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
- App.ServiceConfigCategory.create({ name: 'AdvancedPigLog4j', displayName : 'Custom pig-log4j.xml', siteFileName: 'pig-log4j.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'AdvancedPigLog4j', displayName : 'Custom log4j.properties', siteFileName: 'pig-log4j.xml', canAddProperty: true})
],
sites: ['pig-log4j'],
configs: []