You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2014/01/14 00:35:51 UTC
git commit: AMBARI-4280. mapred config file is out of sync between
the puppet and python version
Updated Branches:
refs/heads/trunk 5d3677f74 -> 73057ba0a
AMBARI-4280. mapred config file is out of sync between the puppet and python version
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/73057ba0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73057ba0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73057ba0
Branch: refs/heads/trunk
Commit: 73057ba0adc2ff9c29dc737f5857e8ede91a3169
Parents: 5d3677f
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Jan 13 15:28:46 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Jan 13 15:28:46 2014 -0800
----------------------------------------------------------------------
.../MAPREDUCE/configuration/mapred-site.xml | 22 --------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/73057ba0/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml
index 8367581..da3545c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml
@@ -555,28 +555,6 @@
</property>
<property>
- <name>mapreduce.jobhistory.intermediate-done-dir</name>
- <value>/mr-history/tmp</value>
- <description>
- Directory where history files are written by MapReduce jobs.
- </description>
- </property>
-
- <property>
- <name>mapreduce.jobhistory.done-dir</name>
- <value>/mr-history/done</value>
- <description>
- Directory where history files are managed by the MR JobHistory Server.
- </description>
- </property>
-
- <property>
- <name>mapreduce.jobhistory.webapp.address</name>
- <value>localhost:19888</value>
- <description>Enter your JobHistoryServer hostname.</description>
- </property>
-
- <property>
<name>mapred.jobtracker.blacklist.fault-timeout-window</name>
<value>180</value>
<description>