hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oz...@apache.org
Subject hadoop git commit: MAPREDUCE-6281. Fix javadoc in Terasort. Contributed by Albert Chu.
Date Thu, 19 Mar 2015 16:00:54 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 0eeb760c5 -> ef9aa7c34


MAPREDUCE-6281. Fix javadoc in Terasort. Contributed by Albert Chu.

(cherry picked from commit 1ccbc29708f7e89b9292a861df3bc3b8f4f7febe)


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

Branch: refs/heads/branch-2
Commit: ef9aa7c34b65f7643f3e3c4e317e5758bd4c75dd
Parents: 0eeb760
Author: Tsuyoshi Ozawa <ozawa@apache.org>
Authored: Fri Mar 20 00:58:34 2015 +0900
Committer: Tsuyoshi Ozawa <ozawa@apache.org>
Committed: Fri Mar 20 00:59:43 2015 +0900

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                               | 2 ++
 .../main/java/org/apache/hadoop/examples/terasort/TeraSort.java    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef9aa7c3/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 8906809..9f83de7 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -30,6 +30,8 @@ Release 2.8.0 - UNRELEASED
 
   BUG FIXES
 
+    MAPREDUCE-6281. Fix javadoc in Terasort. (Albert Chu via ozawa)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef9aa7c3/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java
b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java
index fe771fc..5d586e6 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java
@@ -145,7 +145,7 @@ public class TeraSort extends Configured implements Tool {
      * Read the cut points from the given sequence file.
      * @param fs the file system
      * @param p the path to read
-     * @param job the job config
+     * @param conf the job config
      * @return the strings to split the partitions on
      * @throws IOException
      */


Mime
View raw message