Repository: hadoop Updated Branches: refs/heads/branch-2.8 6ba6f993f -> 8ffa844d4
MAPREDUCE-6614. Remove unnecessary code in TestMapreduceConfigFields. Contributed by Kai Sasaki. (cherry picked from commit a9386cae6ef80d10f6427950b8ca9b77d5f86ca3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8ffa844d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8ffa844d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8ffa844d Branch: refs/heads/branch-2.8 Commit: 8ffa844d48d0d57702b92f056e180061b4d46a2a Parents: 6ba6f99 Author: Akira Ajisaka <[email protected]> Authored: Mon Jan 25 11:39:42 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Mon Jan 25 11:40:08 2016 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8ffa844d/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f1cc7cf..5a67676 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -391,6 +391,9 @@ Release 2.8.0 - UNRELEASED mapreduce.reduce.skip.proc.count.autoincr in mapred-default.xml. (Kai Sasaki via aajisaka) + MAPREDUCE-6614. Remove unnecessary code in TestMapreduceConfigFields. + (Kai Sasaki via aajisaka) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/8ffa844d/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java index 171b5e0..3651e29 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/TestMapreduceConfigFields.java @@ -75,8 +75,6 @@ public class TestMapreduceConfigFields extends TestConfigurationFieldsBase { // Obsolete entries listed in MAPREDUCE-6057 were removed from trunk // but not removed from branch-2. xmlPropsToSkipCompare.add("map.sort.class"); - xmlPropsToSkipCompare.add("mapreduce.reduce.skip.proc-count.auto-incr"); - xmlPropsToSkipCompare.add("mapreduce.map.skip.proc-count.auto-incr"); xmlPropsToSkipCompare.add("mapreduce.local.clientfactory.class.name"); }
