You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pa...@apache.org on 2015/11/23 08:03:56 UTC
[2/2] falcon git commit: Merge of 1597 and trunk
Merge of 1597 and trunk
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f3b781de
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f3b781de
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f3b781de
Branch: refs/heads/master
Commit: f3b781dec693f6740311c65567795a715a6bd1ad
Parents: fac91b2 0fe2762
Author: Pallavi Rao <pa...@inmobi.com>
Authored: Mon Nov 23 12:33:34 2015 +0530
Committer: Pallavi Rao <pa...@inmobi.com>
Committed: Mon Nov 23 12:33:34 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 6 +
docs/src/site/twiki/FalconCLI.twiki | 5 +-
docs/src/site/twiki/falconcli/CommonCLI.twiki | 21 ++++
.../site/twiki/falconcli/ContinueInstance.twiki | 8 ++
docs/src/site/twiki/falconcli/Definition.twiki | 8 ++
.../src/site/twiki/falconcli/DeleteEntity.twiki | 8 ++
.../site/twiki/falconcli/DependencyEntity.twiki | 10 ++
.../twiki/falconcli/DependencyInstance.twiki | 33 ++++++
.../src/site/twiki/falconcli/EdgeMetadata.twiki | 11 ++
docs/src/site/twiki/falconcli/FalconCLI.twiki | 112 +++++++++++++++++++
.../twiki/falconcli/FeedInstanceListing.twiki | 11 ++
docs/src/site/twiki/falconcli/HelpAdmin.twiki | 6 +
.../src/site/twiki/falconcli/KillInstance.twiki | 14 +++
.../twiki/falconcli/LifeCycleInstance.twiki | 9 ++
.../site/twiki/falconcli/LineageMetadata.twiki | 12 ++
docs/src/site/twiki/falconcli/ListEntity.twiki | 17 +++
.../src/site/twiki/falconcli/ListInstance.twiki | 19 ++++
.../src/site/twiki/falconcli/ListMetadata.twiki | 13 +++
.../src/site/twiki/falconcli/LogsInstance.twiki | 14 +++
docs/src/site/twiki/falconcli/Lookup.twiki | 12 ++
.../site/twiki/falconcli/ParamsInstance.twiki | 8 ++
.../site/twiki/falconcli/RelationMetadata.twiki | 10 ++
.../site/twiki/falconcli/RerunInstance.twiki | 10 ++
.../src/site/twiki/falconcli/ResumeEntity.twiki | 8 ++
.../site/twiki/falconcli/ResumeInstance.twiki | 8 ++
.../site/twiki/falconcli/RunningInstance.twiki | 13 +++
docs/src/site/twiki/falconcli/SLAAlert.twiki | 49 ++++++++
docs/src/site/twiki/falconcli/Schedule.twiki | 13 +++
docs/src/site/twiki/falconcli/StatusAdmin.twiki | 8 ++
.../src/site/twiki/falconcli/StatusEntity.twiki | 8 ++
.../site/twiki/falconcli/StatusInstance.twiki | 20 ++++
docs/src/site/twiki/falconcli/Submit.twiki | 13 +++
.../src/site/twiki/falconcli/SubmitRecipe.twiki | 17 +++
.../site/twiki/falconcli/SummaryEntity.twiki | 14 +++
.../site/twiki/falconcli/SummaryInstance.twiki | 20 ++++
.../site/twiki/falconcli/SuspendEntity.twiki | 8 ++
.../site/twiki/falconcli/SuspendInstance.twiki | 8 ++
docs/src/site/twiki/falconcli/Touch.twiki | 10 ++
.../site/twiki/falconcli/TriageInstance.twiki | 9 ++
.../src/site/twiki/falconcli/UpdateEntity.twiki | 14 +++
.../src/site/twiki/falconcli/VersionAdmin.twiki | 7 ++
.../twiki/falconcli/VertexEdgesMetadata.twiki | 12 ++
.../site/twiki/falconcli/VertexMetadata.twiki | 11 ++
.../site/twiki/falconcli/VerticesMetadata.twiki | 11 ++
docs/src/site/twiki/index.twiki | 2 +-
.../src/site/twiki/restapi/EntitySchedule.twiki | 70 +++++++++++-
.../apache/falcon/oozie/OozieEntityBuilder.java | 23 ++++
.../workflow/engine/OozieWorkflowEngine.java | 3 +-
.../feed/OozieFeedWorkflowBuilderTest.java | 16 +++
.../OozieProcessWorkflowBuilderTest.java | 18 +++
.../notification/service/impl/AlarmService.java | 2 +-
.../falcon/state/store/InMemoryStateStore.java | 9 +-
52 files changed, 792 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/f3b781de/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8ce2e85,b0f2f89..700f7e0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,8 -35,10 +35,12 @@@ Trunk (Unreleased
OPTIMIZATIONS
BUG FIXES
+ FALCON-1597 Falcon should not retry in case of an instance being manual kill from user (Sandeep Samudrala via Pallavi Rao)
+
+ FALCON-1606 Process schedule fails in some cases in case of NativeScheduler(Pavan Kumar Kolamuri via Ajay Yadava)
+
+ FALCON-1605 Instance API is not working as expected in case of Native Scheduler(Pavan Kumar Kolamuri via Ajay Yadava)
+
FALCON-1603 FeedHelperTest::testGetDateFromPath fails in some environments(Balu Vellanki via Ajay Yadava)
FALCON-1372 Retention does not work in corner cases(Balu Vellanki via Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/f3b781de/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
----------------------------------------------------------------------