This is an automated email from the ASF dual-hosted git repository. jhung pushed a commit to branch branch-2 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2 by this push: new 758085a YARN-9162. Fix TestRMAdminCLI#testHelp. Contributed by Ayush Saxena. 758085a is described below commit 758085a87ea304349b22d6a28a015b831c3e1a56 Author: Akira Ajisaka <aajis...@apache.org> AuthorDate: Mon Jan 7 17:32:28 2019 +0900 YARN-9162. Fix TestRMAdminCLI#testHelp. Contributed by Ayush Saxena. (cherry picked from commit 5db7c4906235dd1070b9706ca4971f1eb5d74139) (cherry picked from commit a453f38015fec454f63e9f5459b0330ac3bc7eb3) (cherry picked from commit 3c9d2f53175e11ae12fe5857289980ee612124a8) --- .../src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java index 24c1da0..fdd5513 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java @@ -182,7 +182,8 @@ public class RMAdminCLI extends HAAdmin { private static void appendHAUsage(final StringBuilder usageBuilder) { for (Map.Entry<String,UsageInfo> cmdEntry : USAGE.entrySet()) { if (cmdEntry.getKey().equals("-help") - || cmdEntry.getKey().equals("-failover")) { + || cmdEntry.getKey().equals("-failover") + || cmdEntry.getKey().equals("-transitionToObserver")) { continue; } UsageInfo usageInfo = cmdEntry.getValue(); @@ -296,7 +297,8 @@ public class RMAdminCLI extends HAAdmin { } if (isHAEnabled) { for (String cmdKey : USAGE.keySet()) { - if (!cmdKey.equals("-help") && !cmdKey.equals("-failover")) { + if (!cmdKey.equals("-help") && !cmdKey.equals("-failover") + && !cmdKey.equals("-transitionToObserver")) { buildHelpMsg(cmdKey, helpBuilder); helpBuilder.append("\n"); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org