Repository: hadoop Updated Branches: refs/heads/branch-2 f0b1b5317 -> 7c4be1599
MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. Contributed by Kai Sasaki. (cherry picked from commit 5cc44d18aa946ce2a7a9ffbd7bcce57b07e9e1cb) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7c4be159 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7c4be159 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7c4be159 Branch: refs/heads/branch-2 Commit: 7c4be1599152b29d329b4e61c21a935aa234d5a9 Parents: f0b1b53 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Jan 15 00:44:24 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Jan 15 00:44:42 2016 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/mapreduce/Job.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c4be159/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1c086df..3fbb119 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -397,6 +397,8 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6068. Illegal progress value warnings in map tasks. (Binglin Chang via junping_du) + MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. (Kai Sasaki via aajisaka) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c4be159/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java index ded9d65..481107f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java @@ -1258,7 +1258,7 @@ public class Job extends JobContextImpl implements JobContext { /** * Default to the new APIs unless they are explicitly set or the old mapper or * reduce attributes are used. - * @throws IOException if the configuration is inconsistant + * @throws IOException if the configuration is inconsistent */ private void setUseNewAPI() throws IOException { int numReduces = conf.getNumReduceTasks(); @@ -1276,7 +1276,7 @@ public class Job extends JobContextImpl implements JobContext { ensureNotSet("mapred.output.format.class", mode); } } else { - String mode = "map compatability"; + String mode = "map compatibility"; ensureNotSet(INPUT_FORMAT_CLASS_ATTR, mode); ensureNotSet(MAP_CLASS_ATTR, mode); if (numReduces != 0) { @@ -1293,7 +1293,7 @@ public class Job extends JobContextImpl implements JobContext { ensureNotSet("mapred.output.format.class", mode); ensureNotSet(oldReduceClass, mode); } else { - String mode = "reduce compatability"; + String mode = "reduce compatibility"; ensureNotSet(OUTPUT_FORMAT_CLASS_ATTR, mode); ensureNotSet(REDUCE_CLASS_ATTR, mode); }
