Explorar o código

MAPREDUCE-4742. Fix typo in nnbench#displayUsage. Contributed by Liang Xie.

(cherry picked from commit 20b8ee1350e62d1b21c951e653302b6e6a8e4f7e)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
Tsuyoshi Ozawa %!s(int64=10) %!d(string=hai) anos
pai
achega
834e9bc3b2

+ 2 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -178,6 +178,8 @@ Release 2.7.0 - UNRELEASED
     MAPREDUCE-5657. [JDK8] Fix Javadoc errors caused by incorrect or illegal
     tags in doc comments. (Akira AJISAKA and Andrew Purtell via ozawa)
 
+    MAPREDUCE-4742. Fix typo in nnbench#displayUsage. (Liang Xie via ozawa)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

+ 2 - 2
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. " +