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 81B6918DDE for ; Wed, 24 Feb 2016 20:02:55 +0000 (UTC) Received: (qmail 18141 invoked by uid 500); 24 Feb 2016 20:02:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 17846 invoked by uid 500); 24 Feb 2016 20:02:44 -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 17271 invoked by uid 99); 24 Feb 2016 20:02:43 -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, 24 Feb 2016 20:02:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B5AC5E8ED0; Wed, 24 Feb 2016 20:02:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jing9@apache.org To: common-commits@hadoop.apache.org Date: Wed, 24 Feb 2016 20:02:51 -0000 Message-Id: <32cd9ecd02724355bf3deefd08d843b6@git.apache.org> In-Reply-To: <2e8f5907fcf64d7180aeae8bd986fe6f@git.apache.org> References: <2e8f5907fcf64d7180aeae8bd986fe6f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/50] [abbrv] hadoop git commit: HDFS-6832. Fix the usage of 'hdfs namenode' command. Contributed by Manjunath Ballur. HDFS-6832. Fix the usage of 'hdfs namenode' command. Contributed by Manjunath Ballur. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e78d8e66 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e78d8e66 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e78d8e66 Branch: refs/heads/HDFS-7240 Commit: e78d8e66f748c68d2d88ee748facbfa35817d5e3 Parents: 2440671 Author: Akira Ajisaka Authored: Fri Feb 19 01:35:06 2016 +0900 Committer: Akira Ajisaka Committed: Fri Feb 19 01:35:06 2016 +0900 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/namenode/NameNode.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e78d8e66/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 89fc187..61a783d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2782,6 +2782,9 @@ Release 2.8.0 - UNRELEASED HDFS-9799. Reimplement getCurrentTrashDir to remove incompatibility. (zhz) + HDFS-6832. Fix the usage of 'hdfs namenode' command. + (Manjunath Ballur via aajisaka) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/e78d8e66/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java index 7c4e10f..f376901 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java @@ -282,8 +282,7 @@ public class NameNode implements NameNodeStatusMXBean { + StartupOption.BOOTSTRAPSTANDBY.getName() + "] | \n\t[" + StartupOption.RECOVER.getName() + " [ " + StartupOption.FORCE.getName() + "] ] | \n\t[" - + StartupOption.METADATAVERSION.getName() + " ] " - + " ]"; + + StartupOption.METADATAVERSION.getName() + " ]"; public long getProtocolVersion(String protocol,