Repository: hadoop Updated Branches: refs/heads/branch-2 715c81ef6 -> c1ba22300
HDFS-7324. haadmin command usage prints incorrect command name. Contributed by Brahma Reddy Battula. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c1ba2230 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c1ba2230 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c1ba2230 Branch: refs/heads/branch-2 Commit: c1ba223009a9c97df5a8bcf390e3327f420f3533 Parents: 715c81e Author: Suresh Srinivas <[email protected]> Authored: Mon Nov 3 13:15:14 2014 -0800 Committer: Suresh Srinivas <[email protected]> Committed: Mon Nov 3 13:33:33 2014 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1ba2230/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 7433dbe..2c82a8c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -132,6 +132,9 @@ Release 2.7.0 - UNRELEASED HDFS-7315. DFSTestUtil.readFileBuffer opens extra FSDataInputStream. (Plamen Jeliazkov via wheat9) + HDFS-7324. haadmin command usage prints incorrect command name. + (Brahma Reddy Battula via suresh) + Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1ba2230/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java index 5c4b49d..1ec6d35 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java @@ -89,7 +89,7 @@ public class DFSHAAdmin extends HAAdmin { @Override protected String getUsageString() { - return "Usage: DFSHAAdmin [-ns <nameserviceId>]"; + return "Usage: haadmin"; } @Override
