Repository: hadoop Updated Branches: refs/heads/branch-2.8 f4621e022 -> 54ede2586
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/54ede258 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/54ede258 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/54ede258 Branch: refs/heads/branch-2.8 Commit: 54ede2586c0fda35ef0d4a2d2a7dcfefede52691 Parents: f4621e0 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:47:35 2018 -0600 ---------------------------------------------------------------------- .../src/main/resources/mapred-default.xml | 16 ---------------- 1 file changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/54ede258/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 a0a969f..54aebdd 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 @@ -415,22 +415,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
