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/06 05:50:43 UTC
hadoop git commit: Revert "HADOOP-11543. Improve help message for
hadoop/yarn command. Contributed by Brahma Reddy Battula."
Repository: hadoop
Updated Branches:
refs/heads/branch-2 366a12c3b -> 995f9809c
Revert "HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula."
This reverts commit 366a12c3b9402f3c05522179c26f1972bfce8143.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/995f9809
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/995f9809
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/995f9809
Branch: refs/heads/branch-2
Commit: 995f9809c0250f8bd31a50c4f8620cd21a305717
Parents: 366a12c
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Fri Feb 6 13:49:58 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Fri Feb 6 13:49:58 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 | 9 ++++-----
3 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/995f9809/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 287e979..4b0faf4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -178,9 +178,6 @@ Release 2.7.0 - UNRELEASED
HADOOP-11463 Replace method-local TransferManager object with
S3AFileSystem#transfers. (Ted Yu via stevel)
- HADOOP-11543. Improve help message for hadoop/yarn command.
- (Brahma Reddy Battula via ozawa)
-
OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/995f9809/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..bc33198 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
@@ -32,10 +32,8 @@ HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
function print_usage(){
- echo "Usage: hadoop [--config confdir] [COMMAND | CLASSNAME]"
- echo " CLASSNAME run the class named CLASSNAME"
- echo " or"
- echo " where COMMAND is one of:"
+ echo "Usage: hadoop [--config confdir] [--loglevel loglevel] COMMAND"
+ echo " where COMMAND is one of:"
echo " fs run a generic filesystem user client"
echo " version print the version"
echo " jar <jar> run a jar file"
@@ -49,6 +47,8 @@ function print_usage(){
echo " Hadoop jar and the required libraries"
echo " daemonlog get/set the log level for each daemon"
echo " trace view and modify Hadoop tracing settings"
+ 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/995f9809/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 061fc6e..ca7ee4c 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
@@ -65,10 +65,8 @@ HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
. $HADOOP_LIBEXEC_DIR/yarn-config.sh
function print_usage(){
- echo "Usage: yarn [--config confdir] [COMMAND | CLASSNAME]"
- echo " CLASSNAME run the class named CLASSNAME"
- echo " or"
- echo " where COMMAND is one of:"
+ echo "Usage: yarn [--config confdir] [--loglevel] COMMAND"
+ echo "where COMMAND is one of:"
echo " resourcemanager -format-state-store deletes the RMStateStore"
echo " resourcemanager run the ResourceManager"
echo " nodemanager run a nodemanager on each slave"
@@ -91,7 +89,8 @@ function print_usage(){
echo " required libraries"
echo " daemonlog get/set the log level for each"
echo " daemon"
- echo ""
+ echo " or"
+ echo " CLASSNAME run the class named CLASSNAME"
echo "Most commands print help when invoked w/o parameters."
}