Repository: hadoop Updated Branches: refs/heads/branch-3.1 2958666e0 -> af48a2a0f
MAPREDUCE-6930. mapreduce.map.cpu.vcores and mapreduce.reduce.cpu.vcores are both present twice in mapred-default.xml. Contributed by Sen Zhao (cherry picked from commit 32fa3a63e0e7d8bfb3d3b9b3c500ecb3a4874ecf) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/af48a2a0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/af48a2a0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/af48a2a0 Branch: refs/heads/branch-3.1 Commit: af48a2a0f36d620bc3e1f3c8cf871384a94f0750 Parents: 2958666 Author: Jason Lowe <jl...@apache.org> Authored: Fri Mar 9 10:41:16 2018 -0600 Committer: Jason Lowe <jl...@apache.org> Committed: Fri Mar 9 10:43:08 2018 -0600 ---------------------------------------------------------------------- .../src/main/resources/mapred-default.xml | 16 ---------------- 1 file changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/af48a2a0/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index d0e5a2d..cf8be33 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -422,22 +422,6 @@ </property> <property> - <name>mapreduce.map.cpu.vcores</name> - <value>1</value> - <description> - The number of virtual cores required for each map task. - </description> -</property> - -<property> - <name>mapreduce.reduce.cpu.vcores</name> - <value>1</value> - <description> - The number of virtual cores required for each reduce task. - </description> -</property> - -<property> <name>mapreduce.reduce.merge.inmem.threshold</name> <value>1000</value> <description>The threshold, in terms of the number of files --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
