You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by oz...@apache.org on 2015/09/03 15:49:43 UTC
hadoop git commit: HADOOP-10318. Incorrect reference to nodeFile in
RumenToSLSConverter error message. Contributed by Wei Yan.
Repository: hadoop
Updated Branches:
refs/heads/trunk 9a87f81ce -> 355eaaa33
HADOOP-10318. Incorrect reference to nodeFile in RumenToSLSConverter error message. Contributed by Wei Yan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/355eaaa3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/355eaaa3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/355eaaa3
Branch: refs/heads/trunk
Commit: 355eaaa33d01f06e9efe960b8888fb925e03ffb9
Parents: 9a87f81
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Thu Sep 3 22:48:53 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Thu Sep 3 22:48:53 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/355eaaa3/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 e915290..20474be 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1091,6 +1091,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/355eaaa3/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);
}