hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
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 GMT
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 <aajisaka@apache.org>
Authored: Fri Feb 19 01:35:06 2016 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
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, 


Mime
View raw message