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 9604318C4A for ; Wed, 1 Jul 2015 21:09:57 +0000 (UTC) Received: (qmail 92117 invoked by uid 500); 1 Jul 2015 21:09:49 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 91613 invoked by uid 500); 1 Jul 2015 21:09:49 -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 89803 invoked by uid 99); 1 Jul 2015 21:09:48 -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; Wed, 01 Jul 2015 21:09:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72598E0508; Wed, 1 Jul 2015 21:09:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Wed, 01 Jul 2015 21:10:29 -0000 Message-Id: <686d3ed15ea942b59868fdafa4a3dfd4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [43/46] hadoop git commit: HDFS-8706. Fix typo in datanode startup options in HDFSCommands.html. (Controibuted by Brahma Reddy Battula) HDFS-8706. Fix typo in datanode startup options in HDFSCommands.html. (Controibuted by Brahma Reddy Battula) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ec0dc71c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ec0dc71c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ec0dc71c Branch: refs/heads/HDFS-7240 Commit: ec0dc71cabb2b243a83fe4a7f6ba744907367666 Parents: 2ac87df Author: Arpit Agarwal Authored: Wed Jul 1 10:36:04 2015 -0700 Committer: Arpit Agarwal Committed: Wed Jul 1 10:36:04 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec0dc71c/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 65f286d..3736932 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -992,6 +992,9 @@ Release 2.8.0 - UNRELEASED HDFS-8579. Update HDFS usage with missing options (J.Andreina via vinayakumarb) + HDFS-8706. Fix typo in datanode startup options in HDFSCommands.html. + (Brahma Reddy Battula via Arpit Agarwal) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec0dc71c/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md index 094dda1..1c2026c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md @@ -298,7 +298,7 @@ See the [HDFS Transparent Encryption Documentation](./TransparentEncryption.html ### `datanode` -Usage: `hdfs datanode [-regular | -rollback | -rollingupgrace rollback]` +Usage: `hdfs datanode [-regular | -rollback | -rollingupgrade rollback]` | COMMAND\_OPTION | Description | |:---- |:---- |