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 oz...@apache.org on 2015/03/19 17:00:38 UTC
hadoop git commit: MAPREDUCE-6281. Fix javadoc in Terasort.
Contributed by Albert Chu.
Repository: hadoop
Updated Branches:
refs/heads/trunk 522c89714 -> 1ccbc2970
MAPREDUCE-6281. Fix javadoc in Terasort. Contributed by Albert Chu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1ccbc297
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1ccbc297
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1ccbc297
Branch: refs/heads/trunk
Commit: 1ccbc29708f7e89b9292a861df3bc3b8f4f7febe
Parents: 522c897
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Fri Mar 20 00:58:34 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Fri Mar 20 00:58:34 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/1ccbc297/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index a832db4..7972c08 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -275,6 +275,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/1ccbc297/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
*/