Repository: oozie Updated Branches: refs/heads/master 1e0bf4c4e -> 335e310b1
OOZIE-3398 [docs] Fix oozie sub-workflow documentation (asalamon74 via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/335e310b Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/335e310b Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/335e310b Branch: refs/heads/master Commit: 335e310b17f8fc5ba93bad140a396e47189e4faf Parents: 1e0bf4c Author: Andras Piros <[email protected]> Authored: Fri Dec 7 10:56:19 2018 +0100 Committer: Andras Piros <[email protected]> Committed: Fri Dec 7 10:56:19 2018 +0100 ---------------------------------------------------------------------- docs/src/site/markdown/WorkflowFunctionalSpec.md | 3 +-- release-log.txt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/335e310b/docs/src/site/markdown/WorkflowFunctionalSpec.md ---------------------------------------------------------------------- diff --git a/docs/src/site/markdown/WorkflowFunctionalSpec.md b/docs/src/site/markdown/WorkflowFunctionalSpec.md index 9576175..7d6a31b 100644 --- a/docs/src/site/markdown/WorkflowFunctionalSpec.md +++ b/docs/src/site/markdown/WorkflowFunctionalSpec.md @@ -1382,8 +1382,7 @@ by any `job-xml` elements. <a name="SubWorkflowAction"></a> #### 3.2.5 Sub-workflow Action -The `sub-workflow` action runs a child workflow job, the child workflow job can be in the same Oozie system or in -another Oozie system. +The `sub-workflow` action runs a child workflow job. The parent workflow job will wait until the child workflow job has completed. http://git-wip-us.apache.org/repos/asf/oozie/blob/335e310b/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index fe9f45a..65f6e19 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.2.0 release (trunk - unreleased) +OOZIE-3398 [docs] Fix oozie sub-workflow documentation (asalamon74 via andras.piros) OOZIE-3399 [tests] Eliminate nested class in TestV1JobsServletBundleEngine and TestV1JobServletBundleEngine (asalamon74 via andras.piros) OOZIE-3379 [client] Auth token cache file name should include OOZIE_URL (zuston via andras.piros) OOZIE-3397 Improve logging in NotificationXCommand (kmarton)
