diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 1729064a55a..9f1ab9973ae 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -15,6 +15,9 @@ Release 2.7.1 - UNRELEASED HADOOP-11868. Invalid user logins trigger large backtraces in server log (Chang Li via jlowe) + HADOOP-11872. "hadoop dfs" command prints message about using "yarn jar" on + Windows(branch-2 only) (Varun Vasudev via cnauroth) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd index d53ba575db0..ccf2fff322e 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd @@ -246,8 +246,6 @@ call :updatepath %HADOOP_BIN_PATH% goto :MakeCmdArgsLoop :EndLoop set hadoop-command-arguments=%_arguments% - @echo note: please use "yarn jar" to launch - @echo YARN applications, not this command. goto :eof :print_usage @@ -256,6 +254,8 @@ call :updatepath %HADOOP_BIN_PATH% @echo fs run a generic filesystem user client @echo version print the version @echo jar ^ run a jar file + @echo note: please use "yarn jar" to launch + @echo YARN applications, not this command. @echo checknative [-a^|-h] check native hadoop and compression libraries availability @echo distcp ^ ^ copy file or directories recursively @echo archive -archiveName NAME -p ^ ^* ^ create a hadoop archive