Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'trunk' into HDFS-6581

This commit is contained in:
arp 2014-09-29 20:09:06 -07:00
parent 7f0422be76 0577eb32fc
commit 368e2423a5
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -522,6 +522,9 @@ Release 2.6.0 - UNRELEASED
HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang) HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang)
HDFS-6779. Add missing version subcommand for hdfs.
(Sasaki Toru via wheat9)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-6690. Deduplicate xattr names in memory. (wang) HDFS-6690. Deduplicate xattr names in memory. (wang)

4
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
View File

@ -49,6 +49,7 @@ function hadoop_usage
echo " snapshotDiff diff two snapshots of a directory or diff the" echo " snapshotDiff diff two snapshots of a directory or diff the"
echo " current directory contents with a snapshot" echo " current directory contents with a snapshot"
echo " storagepolicies get all the existing block storage policies" echo " storagepolicies get all the existing block storage policies"
echo " version print the version"
echo " zkfc run the ZK Failover Controller daemon" echo " zkfc run the ZK Failover Controller daemon"
echo "" echo ""
echo "Most commands print help when invoked w/o parameters." echo "Most commands print help when invoked w/o parameters."
@ -220,6 +221,9 @@ case ${COMMAND} in
storagepolicies) storagepolicies)
CLASS=org.apache.hadoop.hdfs.tools.GetStoragePolicies CLASS=org.apache.hadoop.hdfs.tools.GetStoragePolicies
;; ;;
version)
CLASS=org.apache.hadoop.util.VersionInfo
;;
zkfc) zkfc)
daemon="true" daemon="true"
CLASS='org.apache.hadoop.hdfs.tools.DFSZKFailoverController' CLASS='org.apache.hadoop.hdfs.tools.DFSZKFailoverController'

6
hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm
View File

@ -117,6 +117,12 @@ HDFS Commands Guide
| | (no progress). | | (no progress).
*------------------------+---------------------------------------------+ *------------------------+---------------------------------------------+
** <<<version>>>
Prints the version.
Usage: <<<hdfs version>>>
* Administration Commands * Administration Commands
Commands useful for administrators of a hadoop cluster. Commands useful for administrators of a hadoop cluster.