From 6c790a7ab0540563f79e5a3aac2a1b6d00827a05 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Mon, 8 Sep 2014 10:32:06 -0700 Subject: [PATCH] HDFS-6893. crypto subcommand is not sorted properly in hdfs\'s hadoop_usage (David Luo via aw) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 1dbfc234c82..61adf388339 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -259,6 +259,9 @@ Trunk (Unreleased) intermittently with various symptoms - debugging patch. (Yongjun Zhang via Arpit Agarwal) + HDFS-6893. crypto subcommand is not sorted properly in hdfs's hadoop_usage + (David Luo via aw) + Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs index 2300dbfcc5d..2ba6d1b1a9c 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs @@ -23,6 +23,7 @@ function hadoop_usage echo " cacheadmin configure the HDFS cache" echo " classpath prints the class path needed to get the" echo " Hadoop jar and the required libraries" + echo " crypto configure HDFS encryption zones" echo " datanode run a DFS datanode" echo " dfs run a filesystem command on the file system" echo " dfsadmin run a DFS admin client" @@ -46,7 +47,6 @@ function hadoop_usage echo " snapshotDiff diff two snapshots of a directory or diff the" echo " current directory contents with a snapshot" echo " zkfc run the ZK Failover Controller daemon" - echo " crypto configure HDFS encryption zones" echo "" echo "Most commands print help when invoked w/o parameters." }