HDFS-4533. Merge 1481178 from trunk.

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

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

@@ -246,6 +246,9 @@ Release 2.0.5-beta - UNRELEASED
 
     HDFS-4751. TestLeaseRenewer#testThreadName flakes. (Andrew Wang via atm)
 
+    HDFS-4533. start-dfs.sh ignores additional parameters besides -upgrade.
+    (Fengdong Yu via suresh)
+
 Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh

@@ -20,7 +20,7 @@
 # Optinally upgrade or rollback dfs state.
 # Run this on master node.
 
-usage="Usage: start-dfs.sh [-upgrade|-rollback]"
+usage="Usage: start-dfs.sh [-upgrade|-rollback] [other options such as -clusterId]"
 
 bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
@@ -46,6 +46,9 @@ if [ $# -ge 1 ]; then
 	esac
 fi
 
+#Add other possible options
+nameStartOpt="$nameStartOpts $@"
+
 #---------------------------------------------------------
 # namenodes