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 A4C9D187C4 for ; Mon, 8 Feb 2016 21:49:20 +0000 (UTC) Received: (qmail 51899 invoked by uid 500); 8 Feb 2016 21:49:20 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 51840 invoked by uid 500); 8 Feb 2016 21:49:20 -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 51831 invoked by uid 99); 8 Feb 2016 21:49: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; Mon, 08 Feb 2016 21:49:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 43666E00B2; Mon, 8 Feb 2016 21:49:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: umamahesh@apache.org To: common-commits@hadoop.apache.org Message-Id: <05d8967d9c7f4713ac445f8bf22c9536@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-9777. Fix typos in DFSAdmin command line and documentation.(Wei-Chiu Chuang via umamahesh) Date: Mon, 8 Feb 2016 21:49:20 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 193d27de0 -> bffaa38a9 HDFS-9777. Fix typos in DFSAdmin command line and documentation.(Wei-Chiu Chuang via umamahesh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bffaa38a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bffaa38a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bffaa38a Branch: refs/heads/trunk Commit: bffaa38a91b26920206a3350bf1cd60ec950aa74 Parents: 193d27d Author: Uma Maheswara Rao G Authored: Mon Feb 8 13:47:45 2016 -0800 Committer: Uma Maheswara Rao G Committed: Mon Feb 8 13:47:45 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml | 2 +- .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bffaa38a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java index ba3e5cf..ac28780 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java @@ -133,7 +133,7 @@ public final class HdfsConstants { } } - /** Covert the given String to a RollingUpgradeAction. */ + /** Convert the given String to a RollingUpgradeAction. */ public static RollingUpgradeAction fromString(String s) { return MAP.get(StringUtils.toUpperCase(s)); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/bffaa38a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 07f01ff..68bb6c6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1887,6 +1887,9 @@ Release 2.8.0 - UNRELEASED HDFS-9503. Use generic option -fs for NNThroughputBenchmark instead of -namenode. (Mingliang Liu via shv) + HDFS-9777. Fix typos in DFSAdmin command line and documentation. + (Wei-Chiu Chuang via umamahesh) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/bffaa38a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml index 5514700..e4915a7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml @@ -3308,7 +3308,7 @@ order written.

]]> deprecated="not deprecated"> - + http://git-wip-us.apache.org/repos/asf/hadoop/blob/bffaa38a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java index 9c782e9..d84d664 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java @@ -372,7 +372,7 @@ public class DFSAdmin extends FsShell { final RollingUpgradeAction action = RollingUpgradeAction.fromString( argv.length >= 2? argv[1]: ""); if (action == null) { - throw new IllegalArgumentException("Failed to covert \"" + argv[1] + throw new IllegalArgumentException("Failed to convert \"" + argv[1] +"\" to " + RollingUpgradeAction.class.getSimpleName()); }