Repository: oozie Updated Branches: refs/heads/master 546d185d2 -> 4c898349c
OOZIE-2303 Typo in documentation (lars_francke via rohini) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/4c898349 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/4c898349 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/4c898349 Branch: refs/heads/master Commit: 4c898349cb0bbf73d9d2b8c91ca72c6520c49a6f Parents: 546d185 Author: Rohini Palaniswamy <[email protected]> Authored: Fri Oct 30 13:33:13 2015 -0700 Committer: Rohini Palaniswamy <[email protected]> Committed: Fri Oct 30 13:33:13 2015 -0700 ---------------------------------------------------------------------- docs/src/site/twiki/WorkflowFunctionalSpec.twiki | 2 +- release-log.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/4c898349/docs/src/site/twiki/WorkflowFunctionalSpec.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/WorkflowFunctionalSpec.twiki b/docs/src/site/twiki/WorkflowFunctionalSpec.twiki index a084c1a..2ce56bf 100644 --- a/docs/src/site/twiki/WorkflowFunctionalSpec.twiki +++ b/docs/src/site/twiki/WorkflowFunctionalSpec.twiki @@ -1451,7 +1451,7 @@ A =java= action can create a Hadoop configuration for interacting with a cluster Oozie prepares a Hadoop configuration file which includes the environments site configuration files (e.g. hdfs-site.xml, mapred-site.xml, etc) plus the properties added to the =<configuration>= section of the =java= action. The Hadoop configuration file is made available as a local file to the Java application in its running directory. It can be added to the =java= actions -Hadoop configuration by referencing the system property: =oozie-action.conf.xml=. For example: +Hadoop configuration by referencing the system property: =oozie.action.conf.xml=. For example: <verbatim> // loading action conf prepared by Oozie http://git-wip-us.apache.org/repos/asf/oozie/blob/4c898349/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 9dbcd1d..d1b14a9 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2303 Typo in documentation (lars_francke via rohini) OOZIE-2328 Coordinator endtime change should check if the last action is in database (kailongs via puru) OOZIE-2367 fs delete should support skipTrash option (jaydeepvishwakarma via rohini) OOZIE-2368 coord:dateOffset and coord:dateTzOffset can't be used for coord initial-instance (puru)
