Author: mona
Date: Fri Aug 23 17:27:07 2013
New Revision: 1516939
URL: http://svn.apache.org/r1516939
Log:
OOZIE-1510 Fix branch-4.0 compilation (mona)
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
oozie/branches/branch-4.0/release-log.txt
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java?rev=1516939&r1=1516938&r2=1516939&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
Fri Aug 23 17:27:07 2013
@@ -188,12 +188,4 @@ public class CoordKillXCommand extends K
return coordJob;
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#getKey()
- */
- @Override
- public String getKey(){
- return getName() + "_" + jobId;
- }
-
}
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java?rev=1516939&r1=1516938&r2=1516939&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
Fri Aug 23 17:27:07 2013
@@ -35,6 +35,7 @@ import org.apache.oozie.client.WorkflowJ
import org.apache.oozie.client.rest.JsonBean;
import org.apache.oozie.command.CommandException;
import org.apache.oozie.command.PreconditionException;
+import org.apache.oozie.command.coord.CoordActionUpdateXCommand;
import org.apache.oozie.command.wf.ActionXCommand.ActionExecutorContext;
import org.apache.oozie.executor.jpa.BulkUpdateInsertJPAExecutor;
import org.apache.oozie.executor.jpa.JPAExecutorException;
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1516939&r1=1516938&r2=1516939&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Fri Aug 23 17:27:07 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.0 release
+OOZIE-1510 Fix branch-4.0 compilation (mona)
OOZIE-1507 Command queue filling up with duplicate commands from
RecoveryService (rohini)
OOZIE-1502 Coordinator Job not going to Failed if a bad HCat-uri is specified
(mona)
OOZIE-1501 Mapreduce action counters are picked up from launcher job instead
of mapreduce job (rohini)
