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

Revert HADOOP-11257 because it didn't get a jenkins run yet

This commit is contained in:
Colin Patrick Mccabe 2014-11-14 13:06:41 -08:00
parent 490df57fa2
commit 5b90e428a5
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/src/main/bin/hadoop
View File

@ -31,8 +31,6 @@ function print_usage(){
echo " fs run a generic filesystem user client" echo " fs run a generic filesystem user client"
echo " version print the version" echo " version print the version"
echo " jar <jar> run a jar file" 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 " checknative [-a|-h] check native hadoop and compression libraries availability"
echo " distcp <srcurl> <desturl> copy file or directories recursively" echo " distcp <srcurl> <desturl> copy file or directories recursively"
echo " archive -archiveName NAME -p <parent path> <src>* <dest> create a hadoop archive" 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 CLASS=org.apache.hadoop.util.VersionInfo
elif [ "$COMMAND" = "jar" ] ; then elif [ "$COMMAND" = "jar" ] ; then
CLASS=org.apache.hadoop.util.RunJar 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 elif [ "$COMMAND" = "key" ] ; then
CLASS=org.apache.hadoop.crypto.key.KeyShell CLASS=org.apache.hadoop.crypto.key.KeyShell
elif [ "$COMMAND" = "checknative" ] ; then elif [ "$COMMAND" = "checknative" ] ; then

7
hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
View File

@ -157,11 +157,6 @@ call :updatepath %HADOOP_BIN_PATH%
goto :eof goto :eof
:version :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 set CLASS=org.apache.hadoop.util.VersionInfo
goto :eof goto :eof
@ -246,8 +241,6 @@ call :updatepath %HADOOP_BIN_PATH%
goto :MakeCmdArgsLoop goto :MakeCmdArgsLoop
:EndLoop :EndLoop
set hadoop-command-arguments=%_arguments% set hadoop-command-arguments=%_arguments%
@echo note: please use "yarn jar" to launch
@echo YARN applications, not this command.
goto :eof goto :eof
:print_usage :print_usage

3
hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
View File

@ -177,9 +177,6 @@ User Commands
Word count example is also run using jar command. It can be referred from Word count example is also run using jar command. It can be referred from
Wordcount example Wordcount example
Use {{{../../hadoop-yarn/hadoop-yarn-site/YarnCommands.html#jar}<<<yarn jar>>>}}
to launch YARN applications instead.
* <<<job>>> * <<<job>>>
Deprecated. Use Deprecated. Use