Repository: hadoop Updated Branches: refs/heads/branch-2 5e686dae4 -> 5f0d1f10d
MAPREDUCE-2815. JavaDoc does not generate correctly for MultithreadedMapRunner. Contributed by Chris Palmer. (cherry picked from commit 9a37247a6747d5d1a8749750698a1ae2f7b68414) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f0d1f10 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f0d1f10 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f0d1f10 Branch: refs/heads/branch-2 Commit: 5f0d1f10db7a080c72567abcdf1e4de38daadbce Parents: 5e686da Author: Akira Ajisaka <[email protected]> Authored: Tue Feb 24 12:10:17 2015 -0800 Committer: Akira Ajisaka <[email protected]> Committed: Tue Feb 24 12:11:22 2015 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f0d1f10/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f56f2b9..14018b6 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -145,6 +145,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked twice (Tsuyoshi OZAWA via jlowe) + MAPREDUCE-2815. JavaDoc does not generate correctly for + MultithreadedMapRunner. (Chris Palmer via aajisaka) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f0d1f10/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java index 456cdfa..98d794b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java @@ -36,17 +36,17 @@ import java.io.IOException; import java.util.concurrent.*; /** - * Multithreaded implementation for @link org.apache.hadoop.mapred.MapRunnable. + * Multithreaded implementation for {@link MapRunnable}. * <p> * It can be used instead of the default implementation, - * @link org.apache.hadoop.mapred.MapRunner, when the Map operation is not CPU - * bound in order to improve throughput. + * of {@link org.apache.hadoop.mapred.MapRunner}, when the Map + * operation is not CPU bound in order to improve throughput. * <p> * Map implementations using this MapRunnable must be thread-safe. * <p> * The Map-Reduce job has to be configured to use this MapRunnable class (using * the JobConf.setMapRunnerClass method) and - * the number of thread the thread-pool can use with the + * the number of threads the thread-pool can use with the * <code>mapred.map.multithreadedrunner.threads</code> property, its default * value is 10 threads. * <p>
