From 1ccbc29708f7e89b9292a861df3bc3b8f4f7febe Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Fri, 20 Mar 2015 00:58:34 +0900 Subject: [PATCH] MAPREDUCE-6281. Fix javadoc in Terasort. Contributed by Albert Chu. --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../main/java/org/apache/hadoop/examples/terasort/TeraSort.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index a832db42443..7972c082a9f 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 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 fe771fc46d1..5d586e67c55 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 */