Repository: hadoop Updated Branches: refs/heads/branch-2.8 b85b8d90d -> ecba5f2ed
YARN-4605. Spelling mistake in the help message of "yarn applicationattempt" command. Contributed by Weiwei Yang. (cherry picked from commit 8f58f742aea87b2b46b9741ffeaebfa36af3573f) (cherry picked from commit ddc22bbcb1c2e90f64092e94d295515ff8c7fe48) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ecba5f2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ecba5f2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ecba5f2e Branch: refs/heads/branch-2.8 Commit: ecba5f2ed3bf4c19d32243bd34c3b5ba632bc4e7 Parents: b85b8d9 Author: Akira Ajisaka <[email protected]> Authored: Fri Jan 22 19:43:06 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Fri Jan 22 19:47:57 2016 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java | 4 ++-- .../java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java | 2 +- .../hadoop/yarn/server/resourcemanager/ClientRMService.java | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ecba5f2e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7cee108..1192843 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1161,6 +1161,9 @@ Release 2.8.0 - UNRELEASED YARN-4608. Redundant code statement in WritingYarnApplications. (Kai Sasaki via aajisaka) + YARN-4605. Spelling mistake in the help message of "yarn applicationattempt" + command. (Weiwei Yang via aajisaka) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/ecba5f2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java index b486074..9075464 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java @@ -138,7 +138,7 @@ public class ApplicationCLI extends YarnCLI { opts.addOption(STATUS_CMD, true, "Prints the status of the application attempt."); opts.addOption(LIST_CMD, true, - "List application attempts for aplication."); + "List application attempts for application."); opts.addOption(FAIL_CMD, true, "Fails application attempt."); opts.addOption(HELP_CMD, false, "Displays help for all commands."); opts.getOption(STATUS_CMD).setArgName("Application Attempt ID"); @@ -712,7 +712,7 @@ public class ApplicationCLI extends YarnCLI { throws YarnException, IOException { ApplicationId appId = ConverterUtils.toApplicationId(applicationId); Priority newAppPriority = Priority.newInstance(Integer.parseInt(priority)); - sysout.println("Updating priority of an aplication " + applicationId); + sysout.println("Updating priority of an application " + applicationId); client.updateApplicationPriority(appId, newAppPriority); sysout.println("Successfully updated the application with id " + applicationId + " with priority '" + priority + "'"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ecba5f2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java index 1a77c7c..95ccccf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java @@ -1721,7 +1721,7 @@ public class TestYarnCLI { pw.println(" -fail <Application Attempt ID> Fails application attempt."); pw.println(" -help Displays help for all commands."); pw.println(" -list <Application ID> List application attempts for"); - pw.println(" aplication."); + pw.println(" application."); pw.println(" -status <Application Attempt ID> Prints the status of the application"); pw.println(" attempt."); pw.close(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ecba5f2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.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/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index 1952427..a730fa3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -437,7 +437,7 @@ public class ClientRMService extends AbstractService implements response = GetApplicationAttemptsResponse.newInstance(listAttempts); } else { throw new YarnException("User " + callerUGI.getShortUserName() - + " does not have privilage to see this aplication " + appId); + + " does not have privilage to see this application " + appId); } return response; } @@ -488,7 +488,7 @@ public class ClientRMService extends AbstractService implements .createContainerReport()); } else { throw new YarnException("User " + callerUGI.getShortUserName() - + " does not have privilage to see this aplication " + appId); + + " does not have privilage to see this application " + appId); } return response; } @@ -541,7 +541,7 @@ public class ClientRMService extends AbstractService implements response = GetContainersResponse.newInstance(listContainers); } else { throw new YarnException("User " + callerUGI.getShortUserName() - + " does not have privilage to see this aplication " + appId); + + " does not have privilage to see this application " + appId); } return response; }
