From a06036bb1e26ba019f45d77e3d653bc92e2138c7 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Fri, 19 Feb 2016 01:35:06 +0900
Subject: [PATCH] HDFS-6832. Fix the usage of 'hdfs namenode' command.
 Contributed by Manjunath Ballur.

(cherry picked from commit e78d8e66f748c68d2d88ee748facbfa35817d5e3)
(cherry picked from commit c183f235f1ae94d5b890bf010f7c9b7fa8cf92d2)
---
 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(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index c51872f30b5..31f2c732293 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1774,6 +1774,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
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 ae1c53e84e4..f3c06b889bb 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 static enum OperationCategory {
       + StartupOption.BOOTSTRAPSTANDBY.getName() + "] | \n\t["
       + StartupOption.RECOVER.getName() + " [ "
       + StartupOption.FORCE.getName() + "] ] | \n\t["
-      + StartupOption.METADATAVERSION.getName() + " ] "
-      + " ]";
+      + StartupOption.METADATAVERSION.getName() + " ]";
 
   
   public long getProtocolVersion(String protocol,