Repository: hadoop Updated Branches: refs/heads/branch-2.8 f18d092bd -> a06036bb1
HDFS-6832. Fix the usage of 'hdfs namenode' command. Contributed by Manjunath Ballur. (cherry picked from commit e78d8e66f748c68d2d88ee748facbfa35817d5e3) (cherry picked from commit c183f235f1ae94d5b890bf010f7c9b7fa8cf92d2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a06036bb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a06036bb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a06036bb Branch: refs/heads/branch-2.8 Commit: a06036bb1e26ba019f45d77e3d653bc92e2138c7 Parents: f18d092 Author: Akira Ajisaka <[email protected]> Authored: Fri Feb 19 01:35:06 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Fri Feb 19 01:35:56 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/a06036bb/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 c51872f..31f2c73 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/a06036bb/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 ae1c53e..f3c06b8 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,
