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 oz...@apache.org on 2015/02/05 07:58:08 UTC

hadoop git commit: HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 0b567f424 -> ec950be17


HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ec950be1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ec950be1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ec950be1

Branch: refs/heads/trunk
Commit: ec950be1735a877675c1c9493846e5b960f373c4
Parents: 0b567f4
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Thu Feb 5 14:21:55 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Thu Feb 5 15:49:36 2015 +0900

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt         |  3 +++
 hadoop-common-project/hadoop-common/src/main/bin/hadoop |  8 ++++----
 hadoop-yarn-project/hadoop-yarn/bin/yarn                | 10 +++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec950be1/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9d6989b..84c9200 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -852,6 +852,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-10062. race condition in MetricsSystemImpl#publishMetricsNow that 
     causes incorrect results. (Sangjin Lee via junping_du)
 
+    HADOOP-11543. Improve help message for hadoop/yarn command.
+    (Brahma Reddy Battula via ozawa)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec950be1/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 6ba327a..d689bda 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
@@ -17,8 +17,10 @@
 
 function hadoop_usage()
 {
-  echo "Usage: hadoop [--config confdir] [--loglevel loglevel] COMMAND"
-  echo "       where COMMAND is one of:"
+  echo "Usage: hadoop [--config confdir] [COMMAND | CLASSNAME]"
+  echo "  CLASSNAME            run the class named CLASSNAME"
+  echo " or"
+  echo "  where COMMAND is one of:"
   echo "  archive -archiveName NAME -p <parent path> <src>* <dest>"
   echo "                       create a Hadoop archive"
   echo "  checknative [-a|-h]  check native Hadoop and compression "
@@ -39,8 +41,6 @@ function hadoop_usage()
   echo "  key                  manage keys via the KeyProvider"
   echo "  trace                view and modify Hadoop tracing settings"
   echo "  version              print the version"
-  echo " or"
-  echo "  CLASSNAME            run the class named CLASSNAME"
   echo ""
   echo "Most commands print help when invoked w/o parameters."
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec950be1/hadoop-yarn-project/hadoop-yarn/bin/yarn
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn
index a034770..0f9212b 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
@@ -17,9 +17,10 @@
 
 function hadoop_usage
 {
-  echo "Usage: yarn [--config confdir] [--daemon (start|stop|status)]"
-  echo "           [--loglevel loglevel] COMMAND"
-  echo "where COMMAND is one of:"
+  echo "Usage: yarn [--config confdir] [COMMAND | CLASSNAME]"
+  echo "  CLASSNAME                             run the class named CLASSNAME"
+  echo " or"
+  echo "  where COMMAND is one of:"
   echo "  application                           prints application(s) report/kill application"
   echo "  applicationattempt                    prints applicationattempt(s) report"
   echo "  classpath                             prints the class path needed to get the"
@@ -39,8 +40,7 @@ function hadoop_usage
   echo "  sharedcachemanager                    run the SharedCacheManager daemon"
   echo "  timelineserver                        run the timeline server"
   echo "  version                               print the version"
-  echo " or"
-  echo "  CLASSNAME                             run the class named CLASSNAME"
+  echo ""
   echo "Most commands print help when invoked w/o parameters."
 }