Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 9f4ec4c54 -> 834e9bc3b
MAPREDUCE-4742. Fix typo in nnbench#displayUsage. Contributed by Liang Xie.
(cherry picked from commit 20b8ee1350e62d1b21c951e653302b6e6a8e4f7e)
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/834e9bc3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/834e9bc3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/834e9bc3
Branch: refs/heads/branch-2.7
Commit: 834e9bc3b24b8ac1f08e781fd942fb7dcca8a351
Parents: 9f4ec4c
Author: Tsuyoshi Ozawa <[email protected]>
Authored: Wed Mar 11 00:41:12 2015 +0900
Committer: Tsuyoshi Ozawa <[email protected]>
Committed: Sat Mar 14 16:58:25 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/834e9bc3/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index 57673f7..618b44c 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/834e9bc3/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. " +
