You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2016/02/24 21:02:51 UTC
[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 <aa...@apache.org>
Authored: Fri Feb 19 01:35:06 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
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,