Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2884617975 for ; Thu, 12 Mar 2015 23:04:33 +0000 (UTC) Received: (qmail 39157 invoked by uid 500); 12 Mar 2015 23:04:22 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 38883 invoked by uid 500); 12 Mar 2015 23:04:22 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 36662 invoked by uid 99); 12 Mar 2015 23:04:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Mar 2015 23:04:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C719DE1905; Thu, 12 Mar 2015 23:04:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjshen@apache.org To: common-commits@hadoop.apache.org Date: Thu, 12 Mar 2015 23:04:50 -0000 Message-Id: In-Reply-To: <8a5b670b2d5c4b2c82ac2917e75b2ce0@git.apache.org> References: <8a5b670b2d5c4b2c82ac2917e75b2ce0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Mar 11 00:41:12 2015 +0900 Committer: Tsuyoshi Ozawa 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 \n" + "\t-startTime