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/06/27 21:11:03 UTC
svn commit: r1497504 - in /incubator/ambari/branches/branch-1.2.5:
ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/
ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/MAPREDUCE/configuration/
ambari-web/a...
Author: jaimin
Date: Thu Jun 27 19:11:02 2013
New Revision: 1497504
URL: http://svn.apache.org/r1497504
Log:
AMBARI-2515. Cannot add property mapred.task.tracker.task-controller .(jaimin)
Modified:
incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_mapping.js
incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_properties.js
Modified: incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml?rev=1497504&r1=1497503&r2=1497504&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml (original)
+++ incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml Thu Jun 27 19:11:02 2013
@@ -256,7 +256,7 @@
<property>
<name>mapred.task.tracker.task-controller</name>
- <value></value>
+ <value>org.apache.hadoop.mapred.DefaultTaskController</value>
<description>
TaskController which is used to launch and manage task execution.
</description>
Modified: incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml?rev=1497504&r1=1497503&r2=1497504&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml (original)
+++ incubator/ambari/branches/branch-1.2.5/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml Thu Jun 27 19:11:02 2013
@@ -256,7 +256,7 @@
<property>
<name>mapred.task.tracker.task-controller</name>
- <value></value>
+ <value>org.apache.hadoop.mapred.DefaultTaskController</value>
<description>
TaskController which is used to launch and manage task execution.
</description>
Modified: incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_mapping.js?rev=1497504&r1=1497503&r2=1497504&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_mapping.js (original)
+++ incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_mapping.js Thu Jun 27 19:11:02 2013
@@ -453,13 +453,6 @@ var configs = [
"filename": "mapred-site.xml"
},
{
- "name": "mapred.task.tracker.task-controller",
- "templateName": ["task_controller"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "mapred-site.xml"
- },
- {
"name": "mapreduce.history.server.embedded",
"templateName": [],
"foreignKey": null,
Modified: incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_properties.js?rev=1497504&r1=1497503&r2=1497504&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/config_properties.js Thu Jun 27 19:11:02 2013
@@ -902,18 +902,6 @@ module.exports =
"category": "Advanced"
},
{
- "id": "puppet var",
- "name": "task_controller",
- "displayName": "task_controller",
- "description": "",
- "defaultValue": "org.apache.hadoop.mapred.DefaultTaskController",
- "displayType": "advanced",
- "isVisible": false,
- "serviceName": "MAPREDUCE",
- "domain": "global",
- "category": "Advanced"
- },
- {
"id": "site property",
"name": "mapred.capacity-scheduler.maximum-system-jobs",
"displayName": "Max system jobs",