HDFS-4763. Merging change r1511519 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511522 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/src/main/bin/hadoop

@@ -57,7 +57,7 @@ case $COMMAND in
     ;;
 
   #hdfs commands
-  namenode|secondarynamenode|datanode|dfs|dfsadmin|fsck|balancer|fetchdt|oiv|dfsgroups)
+  namenode|secondarynamenode|datanode|dfs|dfsadmin|fsck|balancer|fetchdt|oiv|dfsgroups|portmap|nfs3)
     echo "DEPRECATED: Use of this script to execute hdfs command is deprecated." 1>&2
     echo "Instead use the hdfs command for it." 1>&2
     echo "" 1>&2

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -52,6 +52,8 @@ Release 2.1.1-beta - UNRELEASED
 
     HDFS-5071 Change hdfs-nfs parent project to hadoop-project (brandonli)
 
+    HDFS-4763 Add script changes/utility for starting NFS gateway (brandonli)
+
   IMPROVEMENTS
 
     HDFS-4513. Clarify in the WebHDFS REST API that all JSON respsonses may

hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs

@@ -57,6 +57,8 @@ function print_usage(){
   echo "                       current directory contents with a snapshot"
   echo "  lsSnapshottableDir   list all snapshottable dirs owned by the current user"
   echo "						Use -help to see options"
+  echo "  portmap              run a portmap service"
+  echo "  nfs3                 run an NFS version 3 gateway"
   echo ""
   echo "Most commands print help when invoked w/o parameters."
 }
@@ -149,6 +151,10 @@ elif [ "$COMMAND" = "snapshotDiff" ] ; then
   CLASS=org.apache.hadoop.hdfs.tools.snapshot.SnapshotDiff
 elif [ "$COMMAND" = "lsSnapshottableDir" ] ; then
   CLASS=org.apache.hadoop.hdfs.tools.snapshot.LsSnapshottableDir
+elif [ "$COMMAND" = "portmap" ] ; then
+  CLASS=org.apache.hadoop.portmap.Portmap
+elif [ "$COMMAND" = "nfs3" ] ; then
+  CLASS=org.apache.hadoop.hdfs.nfs.nfs3.Nfs3
 else
   CLASS="$COMMAND"
 fi