Repository: oozie Updated Branches: refs/heads/master fe182fd81 -> d9209af99
OOZIE-2757 Malformed xml is Spark action doc page (gezapeti via abhishekbafna) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d9209af9 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d9209af9 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d9209af9 Branch: refs/heads/master Commit: d9209af99cc616626e2ff7dff172266e35acf57b Parents: fe182fd Author: abhisek bafna <[email protected]> Authored: Thu Dec 22 15:02:25 2016 +0530 Committer: abhisek bafna <[email protected]> Committed: Thu Dec 22 15:02:25 2016 +0530 ---------------------------------------------------------------------- docs/src/site/twiki/DG_SparkActionExtension.twiki | 10 +++++----- release-log.txt | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/d9209af9/docs/src/site/twiki/DG_SparkActionExtension.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_SparkActionExtension.twiki b/docs/src/site/twiki/DG_SparkActionExtension.twiki index 74875bb..06b1d0c 100644 --- a/docs/src/site/twiki/DG_SparkActionExtension.twiki +++ b/docs/src/site/twiki/DG_SparkActionExtension.twiki @@ -15,11 +15,11 @@ The =spark= action runs a Spark job. The workflow job will wait until the Spark job completes before continuing to the next action. -To run the Spark job, you have to configure the =spark= action with the -=job-tracker=, =name-node=, Spark =master= elements as +To run the Spark job, you have to configure the =spark= action with +the =job-tracker=, =name-node=, Spark =master= elements as well as the necessary elements, arguments and configuration. -Spark options can be specified in an element called =spark-opts= +Spark options can be specified in an element called =spark-opts=. A =spark= action can be configured to create or delete HDFS directories before starting the Spark job. @@ -79,7 +79,7 @@ specify multiple =job.xml= files. The =configuration= element, if present, contains configuration properties that are passed to the Spark job. -The =master= element indicates the url of the Spark Master. Ex: spark://host:port, mesos://host:port, yarn-cluster, yarn-master, +The =master= element indicates the url of the Spark Master. Ex: spark://host:port, mesos://host:port, yarn-cluster, yarn-client, or local. The =mode= element if present indicates the mode of spark, where to run spark driver program. Ex: client,cluster. This is typically @@ -125,7 +125,7 @@ expressions. </property> </configuration> <master>local[*]</master> - <mode>client<mode> + <mode>client</mode> <name>Spark Example</name> <class>org.apache.spark.examples.mllib.JavaALS</class> <jar>/lib/spark-examples_2.10-1.1.0.jar</jar> http://git-wip-us.apache.org/repos/asf/oozie/blob/d9209af9/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5aa5352..73f0a79 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.4.0 release (trunk - unreleased) +OOZIE-2757 Malformed xml is Spark action doc page (gezapeti via abhishekbafna) OOZIE-2616 Add Tez profile for Hive and Pig sharelibs (poeppt via rkanter) OOZIE-2741 Remove Tomcat (asasvari via rkanter) OOZIE-2745 test-patch should also list the failed tests (gezapeti via rkanter)
