Repository: hadoop Updated Branches: refs/heads/trunk c88c6c57a -> 0577eb32f
HDFS-6779. Add missing version subcommand for hdfs. Contributed by Sasaki Toru. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0577eb32 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0577eb32 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0577eb32 Branch: refs/heads/trunk Commit: 0577eb32fc9b8417c0e7bcd65bda881c41c1c44a Parents: c88c6c5 Author: Haohui Mai <[email protected]> Authored: Mon Sep 29 18:10:47 2014 -0700 Committer: Haohui Mai <[email protected]> Committed: Mon Sep 29 18:10:47 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 4 ++++ .../hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm | 6 ++++++ 3 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0577eb32/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 1b3053c..8a753d3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -522,6 +522,9 @@ Release 2.6.0 - UNRELEASED HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang) + HDFS-6779. Add missing version subcommand for hdfs. + (Sasaki Toru via wheat9) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang) http://git-wip-us.apache.org/repos/asf/hadoop/blob/0577eb32/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 38726a8..a5cb73c 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs @@ -49,6 +49,7 @@ function hadoop_usage echo " snapshotDiff diff two snapshots of a directory or diff the" echo " current directory contents with a snapshot" echo " storagepolicies get all the existing block storage policies" + echo " version print the version" echo " zkfc run the ZK Failover Controller daemon" echo "" echo "Most commands print help when invoked w/o parameters." @@ -220,6 +221,9 @@ case ${COMMAND} in storagepolicies) CLASS=org.apache.hadoop.hdfs.tools.GetStoragePolicies ;; + version) + CLASS=org.apache.hadoop.util.VersionInfo + ;; zkfc) daemon="true" CLASS='org.apache.hadoop.hdfs.tools.DFSZKFailoverController' http://git-wip-us.apache.org/repos/asf/hadoop/blob/0577eb32/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm index 121f0ba..32dc6d1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm @@ -117,6 +117,12 @@ HDFS Commands Guide | | (no progress). *------------------------+---------------------------------------------+ +** <<<version>>> + + Prints the version. + + Usage: <<<hdfs version>>> + * Administration Commands Commands useful for administrators of a hadoop cluster.
