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 2014/09/09 00:21:11 UTC
[6/8] git commit: HDFS-6893. crypto subcommand is not sorted properly
in hdfs\'s hadoop_usage (David Luo via aw)
HDFS-6893. crypto subcommand is not sorted properly in hdfs\'s hadoop_usage (David Luo via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c790a7a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c790a7a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c790a7a
Branch: refs/heads/HDFS-6584
Commit: 6c790a7ab0540563f79e5a3aac2a1b6d00827a05
Parents: cad14aa
Author: Allen Wittenauer <aw...@apache.org>
Authored: Mon Sep 8 10:32:06 2014 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Mon Sep 8 13:10:53 2014 -0700
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c790a7a/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 1dbfc23..61adf38 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c790a7a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
index 2300dbf..2ba6d1b 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."
}