hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. Contributed by Kai Sasaki.
Date Thu, 14 Jan 2016 15:45:32 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 b3fa19029 -> 6816481c7


MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. Contributed by Kai Sasaki.

(cherry picked from commit 5cc44d18aa946ce2a7a9ffbd7bcce57b07e9e1cb)
(cherry picked from commit 7c4be1599152b29d329b4e61c21a935aa234d5a9)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6816481c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6816481c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6816481c

Branch: refs/heads/branch-2.8
Commit: 6816481c72eca66622bcaaf6ffef53b3f92f523e
Parents: b3fa190
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Fri Jan 15 00:44:24 2016 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Fri Jan 15 00:44:52 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/6816481c/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 884f119..4a0fc30 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -385,6 +385,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/6816481c/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);   
       }


Mime
View raw message