Repository: hadoop Updated Branches: refs/heads/branch-2.8 d4d368d4e -> 4417c3b6d
YARN-4534. Remove the redundant symbol in yarn rmadmin help msg. Contributed by Lin Yiqun. (cherry picked from commit 62b0d6151362a9860d4d750e6e0d032882af68aa) (cherry picked from commit ffca0ebfff7fa6d0e6878801da01dfdbe1ed770a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4417c3b6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4417c3b6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4417c3b6 Branch: refs/heads/branch-2.8 Commit: 4417c3b6d2e81901ebbbb84f1f832e50e4858ca6 Parents: d4d368d Author: Akira Ajisaka <aajis...@apache.org> Authored: Thu Jan 14 13:59:39 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Thu Jan 14 14:00:18 2016 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java | 2 +- .../java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4417c3b6/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0f1730b4..ffa2f63 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1125,6 +1125,9 @@ Release 2.8.0 - UNRELEASED YARN-4479. Change CS LeafQueue pendingOrderingPolicy to hornor recovered apps. (Rohith Sharma K S via jianhe) + YARN-4534. Remove the redundant symbol in yarn rmadmin help msg. + (Lin Yiqun via aajisaka) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4417c3b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java ---------------------------------------------------------------------- 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 a5e53e4..5c3b1d8 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 @@ -241,7 +241,7 @@ public class RMAdminCLI extends HAAdmin { + "label2(exclusive=false),label3\">]" + " [-removeFromClusterNodeLabels <label1,label2,label3>]" + " [-replaceLabelsOnNode <\"node1[:port]=label1,label2 node2[:port]=label1\">]" + - " [-directlyAccessNodeLabelStore]]" + + " [-directlyAccessNodeLabelStore]" + " [-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout])"); if (isHAEnabled) { appendHAUsage(summary); http://git-wip-us.apache.org/repos/asf/hadoop/blob/4417c3b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java index f01441d..08e63ea 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java @@ -397,7 +397,7 @@ public class TestRMAdminCLI { "[-removeFromClusterNodeLabels <label1,label2,label3>] " + "[-replaceLabelsOnNode " + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] " + - "[-directlyAccessNodeLabelStore]] [-updateNodeResource " + + "[-directlyAccessNodeLabelStore] [-updateNodeResource " + "[NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " + "[-help [cmd]]")); assertTrue(dataOut @@ -487,7 +487,7 @@ public class TestRMAdminCLI { + " [username]] [-addToClusterNodeLabels <\"label1(exclusive=true)," + "label2(exclusive=false),label3\">]" + " [-removeFromClusterNodeLabels <label1,label2,label3>] [-replaceLabelsOnNode " - + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] [-directlyAccessNodeLabelStore]] " + + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] [-directlyAccessNodeLabelStore] " + "[-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " + "[-transitionToActive [--forceactive] <serviceId>] " + "[-transitionToStandby <serviceId>] "
