Repository: hadoop Updated Branches: refs/heads/branch-2 f4ee0bf19 -> 7f1abf0b2
HADOOP-10318. Incorrect reference to nodeFile in RumenToSLSConverter error message. Contributed by Wei Yan. (cherry picked from commit 355eaaa33d01f06e9efe960b8888fb925e03ffb9) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7f1abf0b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7f1abf0b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7f1abf0b Branch: refs/heads/branch-2 Commit: 7f1abf0b27684a1d0abb754a251bc1fad1e38f00 Parents: f4ee0bf Author: Tsuyoshi Ozawa <[email protected]> Authored: Thu Sep 3 22:48:53 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Thu Sep 3 22:49:12 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f1abf0b/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 77a6f78..3e2cdb3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -594,6 +594,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom. (Charlie Helin via wang) + HADOOP-10318. Incorrect reference to nodeFile in RumenToSLSConverter + error message. (Wei Yan via ozawa) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f1abf0b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java index 63d022b..0d0745c 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java @@ -110,7 +110,7 @@ public class RumenToSLSConverter { if (! nodeFile.getParentFile().exists() && ! nodeFile.getParentFile().mkdirs()) { System.err.println("ERROR: Cannot create output directory in path: " - + jsonFile.getParentFile().getAbsoluteFile()); + + nodeFile.getParentFile().getAbsoluteFile()); System.exit(1); }
