You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2014/07/15 19:52:13 UTC

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

Repository: oozie
Updated Branches:
  refs/heads/master 47d62743a -> 4f927d6f9


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/4f927d6f
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/4f927d6f
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/4f927d6f

Branch: refs/heads/master
Commit: 4f927d6f92403a27acb9a81f72b621ee3b3e4cff
Parents: 47d6274
Author: mona <ch...@yahoo-inc.com>
Authored: Tue Jul 15 10:52:08 2014 -0700
Committer: mona <ch...@yahoo-inc.com>
Committed: Tue Jul 15 10:52:08 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/oozie/blob/4f927d6f/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 2b68436..3cb66e7 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -98,6 +98,7 @@
         <value>
             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,
@@ -106,7 +107,6 @@
             org.apache.oozie.service.HadoopAccessorService,
             org.apache.oozie.service.JobsConcurrencyService,
             org.apache.oozie.service.URIHandlerService,
-            org.apache.oozie.service.MemoryLocksService,
             org.apache.oozie.service.DagXLogInfoService,
             org.apache.oozie.service.SchemaService,
             org.apache.oozie.service.LiteWorkflowAppService,

http://git-wip-us.apache.org/repos/asf/oozie/blob/4f927d6f/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 1f7c322..e94cdb8 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1932 Services should load CallableQueueService after MemoryLocksService (mona)
 OOZIE-1740 Add a new function hadoop:conf() that can be invoked from the workflow.xml and will return a hadoop configuration option (sam liu via rkanter)
 OOZIE-1911 SLA calculation in HA mode does wrong bit comparison for 'start' and 'duration' (mna)
 OOZIE-1926 make gz blob compression as default (ryota)