You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2016/01/14 16:45:14 UTC
hadoop git commit: MAPREDUCE-6601. Fix typo in Job#setUseNewAPI.
Contributed by Kai Sasaki.
Repository: hadoop
Updated Branches:
refs/heads/trunk ff8758377 -> 5cc44d18a
MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. Contributed by Kai Sasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5cc44d18
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5cc44d18
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5cc44d18
Branch: refs/heads/trunk
Commit: 5cc44d18aa946ce2a7a9ffbd7bcce57b07e9e1cb
Parents: ff87583
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Jan 15 00:44:24 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Jan 15 00:44:24 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/5cc44d18/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 7d5d11a..0624b80 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -689,6 +689,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/5cc44d18/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);
}