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 zj...@apache.org on 2015/03/13 00:04:50 UTC

[31/49] hadoop git commit: MAPREDUCE-4742. Fix typo in nnbench#displayUsage. Contributed by Liang Xie.

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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/20b8ee13
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/20b8ee13
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/20b8ee13

Branch: refs/heads/YARN-2928
Commit: 20b8ee1350e62d1b21c951e653302b6e6a8e4f7e
Parents: d39bc90
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Wed Mar 11 00:41:12 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Wed Mar 11 00:41:12 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/20b8ee13/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 5f33041..eecf022 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -257,6 +257,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/20b8ee13/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. " +