OOZIE-1932 Services should load CallableQueueService after MemoryLocksService 
(mona)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/e00411a6
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/e00411a6
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/e00411a6

Branch: refs/remotes/trunk
Commit: e00411a6f67f0aee5c8f0172ef3baab16345ce20
Parents: 0e0aa49
Author: mona <[email protected]>
Authored: Mon Sep 22 11:37:49 2014 -0700
Committer: mona <[email protected]>
Committed: Mon Sep 22 11:37:49 2014 -0700

----------------------------------------------------------------------
 core/src/main/resources/oozie-default.xml | 4 ++--
 release-log.txt                           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/e00411a6/core/src/main/resources/oozie-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/oozie-default.xml 
b/core/src/main/resources/oozie-default.xml
index 874b978..06693bb 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -99,7 +99,6 @@
             org.apache.oozie.service.SchedulerService,
             org.apache.oozie.service.InstrumentationService,
             org.apache.oozie.service.MemoryLocksService,
-            org.apache.oozie.service.CallableQueueService,
             org.apache.oozie.service.UUIDService,
             org.apache.oozie.service.ELService,
             org.apache.oozie.service.AuthorizationService,
@@ -116,8 +115,9 @@
             org.apache.oozie.service.SLAStoreService,
             org.apache.oozie.service.DBLiteWorkflowStoreService,
             org.apache.oozie.service.CallbackService,
-            org.apache.oozie.service.ActionService,
             org.apache.oozie.service.ShareLibService,
+            org.apache.oozie.service.CallableQueueService,
+            org.apache.oozie.service.ActionService,
             org.apache.oozie.service.ActionCheckerService,
             org.apache.oozie.service.RecoveryService,
             org.apache.oozie.service.PurgeService,

http://git-wip-us.apache.org/repos/asf/oozie/blob/e00411a6/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 4bc79df..bc182c5 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -26,6 +26,7 @@ OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang)
 
 -- Oozie 4.1.0 release (4.1 - unreleased)
 
+OOZIE-1932 Services should load CallableQueueService after MemoryLocksService 
(mona)
 OOZIE-1997 Oozie cannot materialize coordinator job with sqlserver in windows 
(bzhang)
 OOZIE-1989 NPE during a rerun with forks (rkanter)
 OOZIE-1945 NPE in JaveActionExecutor#check() (sree2k via rkanter)

Reply via email to