You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2015/03/27 05:49:51 UTC
[1/2] hadoop git commit: HADOOP-11257. Update "hadoop jar"
documentation to warn against using it for launching yarn jars,
addendum to print warning to stderr. Contributed by Masatake Iwasaki.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 c261d35b7 -> 1fd350fa8
refs/heads/branch-2.7 d481a8d79 -> cf2bda8b7
HADOOP-11257. Update "hadoop jar" documentation to warn against using it for launching yarn jars, addendum to print warning to stderr. Contributed by Masatake Iwasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1fd350fa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1fd350fa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1fd350fa
Branch: refs/heads/branch-2
Commit: 1fd350fa8ed83e7b99830ec7adf1b02a36c0c11e
Parents: c261d35
Author: cnauroth <cn...@apache.org>
Authored: Thu Mar 26 21:48:27 2015 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Thu Mar 26 21:48:27 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/src/main/bin/hadoop | 2 +-
hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1fd350fa/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 980cd0c..6346944 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
@@ -110,7 +110,7 @@ case $COMMAND in
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."
+ echo "WARNING: Use \"yarn jar\" to launch YARN applications." 1>&2
fi
elif [ "$COMMAND" = "key" ] ; then
CLASS=org.apache.hadoop.crypto.key.KeyShell
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1fd350fa/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 aebac81..d53ba57 100644
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
@@ -162,9 +162,9 @@ call :updatepath %HADOOP_BIN_PATH%
:jar
if defined YARN_OPTS (
- @echo WARNING: Use "yarn jar" to launch YARN applications.
+ @echo WARNING: Use "yarn jar" to launch YARN applications. 1>&2
) else if defined YARN_CLIENT_OPTS (
- @echo WARNING: Use "yarn jar" to launch YARN applications.
+ @echo WARNING: Use "yarn jar" to launch YARN applications. 1>&2
)
set CLASS=org.apache.hadoop.util.RunJar
goto :eof
[2/2] hadoop git commit: HADOOP-11257. Update "hadoop jar"
documentation to warn against using it for launching yarn jars,
addendum to print warning to stderr. Contributed by Masatake Iwasaki.
Posted by cn...@apache.org.
HADOOP-11257. Update "hadoop jar" documentation to warn against using it for launching yarn jars, addendum to print warning to stderr. Contributed by Masatake Iwasaki.
(cherry picked from commit 1fd350fa8ed83e7b99830ec7adf1b02a36c0c11e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cf2bda8b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cf2bda8b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cf2bda8b
Branch: refs/heads/branch-2.7
Commit: cf2bda8b76b4dc395ed747c3816d8328c49c3d22
Parents: d481a8d
Author: cnauroth <cn...@apache.org>
Authored: Thu Mar 26 21:48:27 2015 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Thu Mar 26 21:48:48 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/src/main/bin/hadoop | 2 +-
hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf2bda8b/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 b71aa8c..bec15cf 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
@@ -110,7 +110,7 @@ case $COMMAND in
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."
+ echo "WARNING: Use \"yarn jar\" to launch YARN applications." 1>&2
fi
elif [ "$COMMAND" = "key" ] ; then
CLASS=org.apache.hadoop.crypto.key.KeyShell
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf2bda8b/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 aebac81..d53ba57 100644
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
@@ -162,9 +162,9 @@ call :updatepath %HADOOP_BIN_PATH%
:jar
if defined YARN_OPTS (
- @echo WARNING: Use "yarn jar" to launch YARN applications.
+ @echo WARNING: Use "yarn jar" to launch YARN applications. 1>&2
) else if defined YARN_CLIENT_OPTS (
- @echo WARNING: Use "yarn jar" to launch YARN applications.
+ @echo WARNING: Use "yarn jar" to launch YARN applications. 1>&2
)
set CLASS=org.apache.hadoop.util.RunJar
goto :eof