Repository: hadoop Updated Branches: refs/heads/branch-2 dbcdcb0d3 -> 482504bef
MAPREDUCE-4742. Fix typo in nnbench#displayUsage. Contributed by Liang Xie. (cherry picked from commit 20b8ee1350e62d1b21c951e653302b6e6a8e4f7e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/482504be Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/482504be Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/482504be Branch: refs/heads/branch-2 Commit: 482504befd380855dc448c626982fa5a984a1f92 Parents: dbcdcb0 Author: Tsuyoshi Ozawa <[email protected]> Authored: Wed Mar 11 00:41:12 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Wed Mar 11 00:41:37 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../src/test/java/org/apache/hadoop/hdfs/NNBench.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/482504be/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index e4005eb..5efcd32 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -12,6 +12,8 @@ Release 2.8.0 - UNRELEASED BUG FIXES + MAPREDUCE-4742. Fix typo in nnbench#displayUsage. (Liang Xie via ozawa) + Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/482504be/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java index bd46e7c..bb50213 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java @@ -182,8 +182,8 @@ public class NNBench { "\t-reduces <number of reduces. default is 1. This is not mandatory>\n" + "\t-startTime <time to start, given in seconds from the epoch. " + "Make sure this is far enough into the future, so all maps " + - "(operations) will start at the same time>. " + - "default is launch time + 2 mins. This is not mandatory \n" + + "(operations) will start at the same time. " + + "default is launch time + 2 mins. This is not mandatory>\n" + "\t-blockSize <Block size in bytes. default is 1. " + "This is not mandatory>\n" + "\t-bytesToWrite <Bytes to write. default is 0. " +
