Repository: oozie Updated Branches: refs/heads/master 4fea9412f -> 6aefbc710
OOZIE-2214 fix test case TestCoordRerunXCommand.testCoordRerunDateNeg (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6aefbc71 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6aefbc71 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6aefbc71 Branch: refs/heads/master Commit: 6aefbc710d28adbe82347dde9d17694f7dd6c753 Parents: 4fea941 Author: egashira <[email protected]> Authored: Fri Apr 24 17:42:08 2015 -0700 Committer: egashira <[email protected]> Committed: Fri Apr 24 17:42:08 2015 -0700 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/coord/CoordUtils.java | 4 +--- release-log.txt | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6aefbc71/core/src/main/java/org/apache/oozie/coord/CoordUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/coord/CoordUtils.java b/core/src/main/java/org/apache/oozie/coord/CoordUtils.java index 90050b3..7f05ef5 100644 --- a/core/src/main/java/org/apache/oozie/coord/CoordUtils.java +++ b/core/src/main/java/org/apache/oozie/coord/CoordUtils.java @@ -143,9 +143,7 @@ public class CoordUtils { if (e.getErrorCode() == ErrorCode.E0605) { XLog.getLog(CoordUtils.class).info("No action for nominal time:" + s + ". Skipping over"); } - else { - throw new CommandException(e); - } + throw new CommandException(e); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/6aefbc71/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index dcc3f9a..1b5cccd 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2214 fix test case TestCoordRerunXCommand.testCoordRerunDateNeg (ryota) OOZIE-2213 oozie-setup.ps1 should use "start-process" rather than "cmd /c" to invoke OozieSharelibCLI or OozieDBCLI commands (bzhang) OOZIE-2210 Update extjs 2.2 link (bzhang) OOZIE-2205 add option to load default/site.xml to actionConf on compute node (ryota)
