Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2616218EE6 for ; Mon, 8 Jun 2015 22:44:35 +0000 (UTC) Received: (qmail 8005 invoked by uid 500); 8 Jun 2015 22:44:35 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 7938 invoked by uid 500); 8 Jun 2015 22:44:34 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 7929 invoked by uid 99); 8 Jun 2015 22:44:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 22:44:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6572DFF90; Mon, 8 Jun 2015 22:44:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xgong@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3778. Fix Yarn resourcemanger CLI usage. Contributed by Brahma Reddy Battula Date: Mon, 8 Jun 2015 22:44:34 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 c6cdecc6b -> 869304dc8 YARN-3778. Fix Yarn resourcemanger CLI usage. Contributed by Brahma Reddy Battula (cherry picked from commit 2b2465dfac1f147b6bb20d878b69a8cc3e85c8ad) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/869304dc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/869304dc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/869304dc Branch: refs/heads/branch-2 Commit: 869304dc83e8bd1070420037583f66675d165ca8 Parents: c6cdecc Author: Xuan Authored: Mon Jun 8 15:43:03 2015 -0700 Committer: Xuan Committed: Mon Jun 8 15:44:25 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../apache/hadoop/yarn/server/resourcemanager/ResourceManager.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/869304dc/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index a0b5323..1d1b403 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -462,6 +462,8 @@ Release 2.8.0 - UNRELEASED YARN-3747. TestLocalDirsHandlerService should delete the created test directory logDir2. (David Moore via devaraj) + YARN-3778. Fix Yarn resourcemanger CLI usage. (Brahma Reddy Battula via xgong) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/869304dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index c209873..4153ba1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -1303,7 +1303,7 @@ public class ResourceManager extends CompositeService implements Recoverable { } private static void printUsage(PrintStream out) { - out.println("Usage: java ResourceManager [-format-state-store]"); + out.println("Usage: yarn resourcemanager [-format-state-store]"); out.println(" " + "[-remove-application-from-state-store ]" + "\n"); }