Repository: oozie Updated Branches: refs/heads/master 48c970267 -> e62289439
OOZIE-2074 Compatibility issue with Yarn and Hadoop 0.23/2.x (jaydeepvishwakarma via shwethags) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/e6228943 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/e6228943 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/e6228943 Branch: refs/heads/master Commit: e62289439e3ea5aae023077d03894335de8829b9 Parents: 48c9702 Author: Shwetha GS <[email protected]> Authored: Tue Nov 25 16:01:11 2014 +0530 Committer: Shwetha GS <[email protected]> Committed: Tue Nov 25 16:01:11 2014 +0530 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/util/JobUtils.java | 2 +- release-log.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/e6228943/core/src/main/java/org/apache/oozie/util/JobUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/JobUtils.java b/core/src/main/java/org/apache/oozie/util/JobUtils.java index 74a817b..e0a9ce6 100644 --- a/core/src/main/java/org/apache/oozie/util/JobUtils.java +++ b/core/src/main/java/org/apache/oozie/util/JobUtils.java @@ -152,7 +152,7 @@ public class JobUtils { fs = file.getFileSystem(defaultConf); } // Hadoop 0.20/1.x. - if (defaultConf.get("yarn.resourcemanager.address") == null) { + if (defaultConf.get("yarn.resourcemanager.webapp.address") == null) { // Duplicate hadoop 1.x code to workaround MAPREDUCE-2361 in Hadoop 0.20 // Refer OOZIE-1806. String filepath = file.toUri().getPath(); http://git-wip-us.apache.org/repos/asf/oozie/blob/e6228943/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index e10471c..195b394 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2074 Compatibility issue with Yarn and Hadoop 0.23/2.x (jaydeepvishwakarma via shwethags) OOZIE-1983 Add spark action executor (pavan kumar via rkanter) OOZIE-1985 support dropping hcat dataset in coord rerun with cleanup option (ryota) OOZIE-2053 Change old HCatalog API (ryota)
