hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmcc...@apache.org
Subject hadoop git commit: Revert HADOOP-11257 because it didn't get a jenkins run yet
Date Fri, 14 Nov 2014 21:06:20 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 10c98aed3 -> f95017b3e


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/f95017b3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f95017b3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f95017b3

Branch: refs/heads/trunk
Commit: f95017b3ead4291e08ce9b6976409efe78995b6e
Parents: 10c98ae
Author: Colin Patrick Mccabe <cmccabe@cloudera.com>
Authored: Fri Nov 14 13:06:03 2014 -0800
Committer: Colin Patrick Mccabe <cmccabe@cloudera.com>
Committed: Fri Nov 14 13:06:03 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/f95017b3/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 9df2c7d..eccd322 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
@@ -33,8 +33,6 @@ function hadoop_usage()
   echo "                       copy file or directories recursively"
   echo "  fs                   run a generic filesystem user client"
   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 "  key                  manage keys via the KeyProvider"
   echo "  trace                view and modify Hadoop tracing settings"
@@ -152,9 +150,6 @@ case ${COMMAND} in
     CLASS=org.apache.hadoop.fs.FsShell
   ;;
   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
   ;;
   jnipath)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f95017b3/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 c537539..fc2e9b7 100644
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
@@ -177,11 +177,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
 
@@ -266,8 +261,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/f95017b3/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


Mime
View raw message