Repository: hadoop Updated Branches: refs/heads/branch-2 490df57fa -> 5b90e428a
Revert HADOOP-11257 because it didn't get a jenkins run yet Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5b90e428 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5b90e428 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5b90e428 Branch: refs/heads/branch-2 Commit: 5b90e428a54b9134311b0aa65449a73b43b6daa8 Parents: 490df57 Author: Colin Patrick Mccabe <[email protected]> Authored: Fri Nov 14 13:06:41 2014 -0800 Committer: Colin Patrick Mccabe <[email protected]> Committed: Fri Nov 14 13:06:41 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/src/main/bin/hadoop | 5 ----- hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd | 7 ------- .../hadoop-common/src/site/apt/CommandsManual.apt.vm | 3 --- 3 files changed, 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b90e428/hadoop-common-project/hadoop-common/src/main/bin/hadoop ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop b/hadoop-common-project/hadoop-common/src/main/bin/hadoop index c5b096f..fa0d981 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop @@ -31,8 +31,6 @@ function print_usage(){ echo " fs run a generic filesystem user client" echo " version print the version" echo " jar <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 <srcurl> <desturl> copy file or directories recursively" echo " archive -archiveName NAME -p <parent path> <src>* <dest> create a hadoop archive" @@ -103,9 +101,6 @@ case $COMMAND in CLASS=org.apache.hadoop.util.VersionInfo elif [ "$COMMAND" = "jar" ] ; then CLASS=org.apache.hadoop.util.RunJar - if [[ -n "${YARN_OPTS}" ]] || [[ -n "${YARN_CLIENT_OPTS}" ]]; then - echo "WARNING: Use \"yarn jar\" to launch YARN applications." - fi elif [ "$COMMAND" = "key" ] ; then CLASS=org.apache.hadoop.crypto.key.KeyShell elif [ "$COMMAND" = "checknative" ] ; then http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b90e428/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd ---------------------------------------------------------------------- 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 5cac64a..da68a7c 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd @@ -157,11 +157,6 @@ call :updatepath %HADOOP_BIN_PATH% goto :eof :version - if defined YARN_OPTS ( - @echo WARNING: Use "yarn jar" to launch YARN applications. - ) else if defined YARN_CLIENT_OPTS ( - @echo WARNING: Use "yarn jar" to launch YARN applications. - ) set CLASS=org.apache.hadoop.util.VersionInfo goto :eof @@ -246,8 +241,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b90e428/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm index 6d2fd5e..7771aa1 100644 --- a/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm +++ b/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm @@ -177,9 +177,6 @@ User Commands Word count example is also run using jar command. It can be referred from Wordcount example - Use {{{../../hadoop-yarn/hadoop-yarn-site/YarnCommands.html#jar}<<<yarn jar>>>}} - to launch YARN applications instead. - * <<<job>>> Deprecated. Use
