Repository: oozie Updated Branches: refs/heads/master 23831e855 -> 5e2b92648
OOZIE-2378 org.apache.oozie.client.TestOozieCLI.testAdminInstrumentation is flakey (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5979b4dc Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5979b4dc Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5979b4dc Branch: refs/heads/master Commit: 5979b4dcab704a5f1e1f83b0feae43a03c9e598e Parents: 23831e8 Author: Robert Kanter <rkan...@cloudera.com> Authored: Thu Oct 1 10:31:33 2015 -0700 Committer: Robert Kanter <rkan...@cloudera.com> Committed: Thu Oct 1 10:31:33 2015 -0700 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/servlet/V2AdminServlet.java | 2 ++ release-log.txt | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/5979b4dc/core/src/main/java/org/apache/oozie/servlet/V2AdminServlet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/servlet/V2AdminServlet.java b/core/src/main/java/org/apache/oozie/servlet/V2AdminServlet.java index adaab76..7eadbe7 100644 --- a/core/src/main/java/org/apache/oozie/servlet/V2AdminServlet.java +++ b/core/src/main/java/org/apache/oozie/servlet/V2AdminServlet.java @@ -57,6 +57,8 @@ public class V2AdminServlet extends V1AdminServlet { Instrumentation instrumentation = services.get(InstrumentationService.class).get(); if (instrumentation instanceof MetricsInstrumentation) { metricsInstrumentation = (MetricsInstrumentation) instrumentation; + } else { + metricsInstrumentation = null; } } } http://git-wip-us.apache.org/repos/asf/oozie/blob/5979b4dc/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 1ccd433..05a8f48 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2378 org.apache.oozie.client.TestOozieCLI.testAdminInstrumentation is flakey (rkanter) OOZIE-2377 Hive2 Action should not propagate oozie.hive2.* properties to Beeline (rkanter) OOZIE-2376 Default action configs not honored if no <configuration> section in workflow (rkanter) OOZIE-2365 oozie fail to start when smtp password not set (rohini)
