Repository: oozie Updated Branches: refs/heads/master 0473b9613 -> 5b55169c6
OOZIE-3295 Flaky test TestSLACalculatorMemory#testAddMultipleRestartRemoveMultipleInstrumentedCorrectly (pbacsko via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5b55169c Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5b55169c Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5b55169c Branch: refs/heads/master Commit: 5b55169c6743194223a0756756fc7247eb673aca Parents: 0473b96 Author: Andras Piros <[email protected]> Authored: Thu Jun 21 23:05:44 2018 +0200 Committer: Andras Piros <[email protected]> Committed: Thu Jun 21 23:05:44 2018 +0200 ---------------------------------------------------------------------- .../test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java | 2 +- release-log.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/5b55169c/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java b/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java index 4a8e8e6..e196033 100644 --- a/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java +++ b/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java @@ -1050,7 +1050,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd"); slaRegBean1.setAppName("app-name"); - slaRegBean1.setExpectedDuration(123); + slaRegBean1.setExpectedDuration(10000); slaRegBean1.setExpectedEnd(sdf.parse("2012-02-07")); slaRegBean1.setExpectedStart(sdf.parse("2011-02-07")); slaRegBean1.setNominalTime(sdf.parse("2012-01-06")); http://git-wip-us.apache.org/repos/asf/oozie/blob/5b55169c/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index af9f4a6..9847b7b 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3295 Flaky test TestSLACalculatorMemory#testAddMultipleRestartRemoveMultipleInstrumentedCorrectly (pbacsko via andras.piros) OOZIE-3289 TestJMSAccessorService#testConnectionRetry is still flaky (pbacsko via andras.piros) OOZIE-3270 Upgrade Derby to 10.14.1.0 (gezapeti) OOZIE-3275 [docs] Update AG_Install.twiki with Access Control List documentation (andras.piros)
