big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Colin Patrick Mccabe 2014-11-14 13:06:03 -08:00
parent 10c98aed38
commit f95017b3ea
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

@ -33,8 +33,6 @@ function hadoop_usage()
echo " copy file or directories recursively" echo " copy file or directories recursively"
echo " fs run a generic filesystem user client" echo " fs run a generic filesystem user client"
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 " jnipath prints the java.library.path" echo " jnipath prints the java.library.path"
echo " key manage keys via the KeyProvider" echo " key manage keys via the KeyProvider"
echo " trace view and modify Hadoop tracing settings" echo " trace view and modify Hadoop tracing settings"
@ -152,9 +150,6 @@ case ${COMMAND} in
CLASS=org.apache.hadoop.fs.FsShell CLASS=org.apache.hadoop.fs.FsShell
;; ;;
jar) jar)
if [[ -n "${YARN_OPTS}" ]] || [[ -n "${YARN_CLIENT_OPTS}" ]]; then
hadoop_error "WARNING: Use \"yarn jar\" to launch YARN applications."
fi
CLASS=org.apache.hadoop.util.RunJar CLASS=org.apache.hadoop.util.RunJar
;; ;;
jnipath) jnipath)

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

@ -177,11 +177,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
@ -266,8 +261,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