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 9219E18639 for ; Thu, 18 Feb 2016 16:36:19 +0000 (UTC) Received: (qmail 82964 invoked by uid 500); 18 Feb 2016 16:36:19 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 82907 invoked by uid 500); 18 Feb 2016 16:36:19 -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 82897 invoked by uid 99); 18 Feb 2016 16:36:19 -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, 18 Feb 2016 16:36:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F127DFF67; Thu, 18 Feb 2016 16:36:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-6832. Fix the usage of 'hdfs namenode' command. Contributed by Manjunath Ballur. Date: Thu, 18 Feb 2016 16:36:19 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 212c519ad -> c183f235f HDFS-6832. Fix the usage of 'hdfs namenode' command. Contributed by Manjunath Ballur. (cherry picked from commit e78d8e66f748c68d2d88ee748facbfa35817d5e3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c183f235 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c183f235 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c183f235 Branch: refs/heads/branch-2 Commit: c183f235f1ae94d5b890bf010f7c9b7fa8cf92d2 Parents: 212c519 Author: Akira Ajisaka Authored: Fri Feb 19 01:35:06 2016 +0900 Committer: Akira Ajisaka Committed: Fri Feb 19 01:35:43 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/c183f235/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 5db3900..9e34866 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1861,6 +1861,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/c183f235/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 9b41a56..fde8b4a 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,