Repository: hadoop Updated Branches: refs/heads/branch-2 46a202722 -> 096ba583f
YARN-3149. Fix typo in message for invalid application id. Contributed by Bibin A Chundatt. (cherry picked from commit b77ff37686e01b7497d3869fbc62789a5b123c0a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/096ba583 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/096ba583 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/096ba583 Branch: refs/heads/branch-2 Commit: 096ba583fad82c79a9a4e264cb3fc36e96758b85 Parents: 46a2027 Author: Xuan <[email protected]> Authored: Thu Feb 5 15:13:57 2015 -0800 Committer: Xuan <[email protected]> Committed: Thu Feb 5 15:15:29 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/096ba583/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ee26217..05344cd 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -454,6 +454,9 @@ Release 2.7.0 - UNRELEASED YARN-3101. In Fair Scheduler, fix canceling of reservations for exceeding max share (Anubhav Dhoot via Sandy Ryza) + YARN-3149. Fix typo in message for invalid application id. + (Bibin A Chundatt via xgong) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/096ba583/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java index 73ec906..0aa68a2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java @@ -204,7 +204,7 @@ public class ConverterUtils { try { return toApplicationId(it); } catch (NumberFormatException n) { - throw new IllegalArgumentException("Invalid AppAttemptId: " + throw new IllegalArgumentException("Invalid ApplicationId: " + appIdStr, n); } }
