Repository: falcon Updated Branches: refs/heads/master 1d3751958 -> 8f2c0fc7f
FALCON-1842 Falcon build failed in Jenkins at OozieFeedWorkflowBuilderTest â¦rTest (Balu Vellanki) Author: bvellanki <[email protected]> Reviewers: Ajay Yadava <[email protected]>, Pallavi Rao Closes #56 from bvellanki/master Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/8f2c0fc7 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/8f2c0fc7 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/8f2c0fc7 Branch: refs/heads/master Commit: 8f2c0fc7f3101dd72710e04cd37ca85097b27938 Parents: 1d37519 Author: bvellanki <[email protected]> Authored: Tue Mar 1 13:39:00 2016 +0530 Committer: Ajay Yadava <[email protected]> Committed: Tue Mar 1 13:39:00 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/8f2c0fc7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 523e1b8..8fb8186 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -35,6 +35,8 @@ Trunk FALCON-1770 Update README file (Ajay Yadava) BUG FIXES + FALCON-1842 Falcon build failed in Jenkins at OozieFeedWorkflowBuilderTest (Balu Vellanki) + FALCON-887 Support for multiple lib paths in falcon process (Sowmya Ramesh) FALCON-1795 Kill api not killing waiting/ready instances http://git-wip-us.apache.org/repos/asf/falcon/blob/8f2c0fc7/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java ---------------------------------------------------------------------- diff --git a/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java b/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java index a553ea7..b0fc230 100644 --- a/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java +++ b/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java @@ -708,17 +708,15 @@ public class OozieFeedWorkflowBuilderTest extends AbstractTestBase { // ClusterHelper constructs new fs Conf. Add it to cluster properties so that it gets added to FS conf setUmaskInFsConf(srcCluster, umask); - org.apache.falcon.entity.v0.feed.Cluster cluster = FeedHelper.getCluster(feed, - srcCluster.getName()); + org.apache.falcon.entity.v0.feed.Cluster cluster = FeedHelper.getCluster(feed, srcCluster.getName()); Calendar startCal = Calendar.getInstance(); Calendar endCal = Calendar.getInstance(); - endCal.roll(Calendar.DATE, 1); + endCal.add(Calendar.DATE, 1); cluster.getValidity().setEnd(endCal.getTime()); RuntimeProperties.get().setProperty("falcon.retention.keep.instances.beyond.validity", "false"); OozieCoordinatorBuilder builder = OozieCoordinatorBuilder.get(feed, Tag.RETENTION); - List<Properties> coords = builder.buildCoords( - srcCluster, new Path("/projects/falcon/" + umask)); + List<Properties> coords = builder.buildCoords(srcCluster, new Path("/projects/falcon/" + umask)); COORDINATORAPP coord = getCoordinator(srcMiniDFS, coords.get(0).getProperty(OozieEntityBuilder.ENTITY_PATH)); Assert.assertEquals(coord.getAction().getWorkflow().getAppPath(), @@ -782,7 +780,7 @@ public class OozieFeedWorkflowBuilderTest extends AbstractTestBase { org.apache.falcon.entity.v0.feed.Cluster cluster = FeedHelper.getCluster(tableFeed, trgCluster.getName()); final Calendar instance = Calendar.getInstance(); - instance.roll(Calendar.YEAR, 1); + instance.add(Calendar.YEAR, 1); cluster.getValidity().setEnd(instance.getTime()); OozieCoordinatorBuilder builder = OozieCoordinatorBuilder.get(tableFeed, Tag.RETENTION);
