You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2015/03/07 01:20:48 UTC
oozie git commit: OOZIE-2164 make master parameterizable in Spark
action example (wypoon via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master 781716e8d -> a5c9829d1
OOZIE-2164 make master parameterizable in Spark action example (wypoon via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/a5c9829d
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/a5c9829d
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/a5c9829d
Branch: refs/heads/master
Commit: a5c9829d14325d8493ac86b41cc8a3d2ece98865
Parents: 781716e
Author: Robert Kanter <rk...@cloudera.com>
Authored: Fri Mar 6 16:20:14 2015 -0800
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Fri Mar 6 16:20:14 2015 -0800
----------------------------------------------------------------------
examples/src/main/apps/spark/job.properties | 1 +
examples/src/main/apps/spark/workflow.xml | 4 ++--
release-log.txt | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/a5c9829d/examples/src/main/apps/spark/job.properties
----------------------------------------------------------------------
diff --git a/examples/src/main/apps/spark/job.properties b/examples/src/main/apps/spark/job.properties
index 4bf67df..a509db0 100644
--- a/examples/src/main/apps/spark/job.properties
+++ b/examples/src/main/apps/spark/job.properties
@@ -18,6 +18,7 @@
nameNode=hdfs://localhost:8020
jobTracker=localhost:8021
+master=local[*]
queueName=default
examplesRoot=examples
oozie.use.system.libpath=true
http://git-wip-us.apache.org/repos/asf/oozie/blob/a5c9829d/examples/src/main/apps/spark/workflow.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/apps/spark/workflow.xml b/examples/src/main/apps/spark/workflow.xml
index f5ac7f6..ecb9eaa 100644
--- a/examples/src/main/apps/spark/workflow.xml
+++ b/examples/src/main/apps/spark/workflow.xml
@@ -22,7 +22,7 @@
<spark xmlns="uri:oozie:spark-action:0.1">
<job-tracker>${jobTracker}</job-tracker>
<name-node>${nameNode}</name-node>
- <master>local[*]</master>
+ <master>${master}</master>
<name>Spark-FileCopy</name>
<class>org.apache.oozie.example.SparkFileCopy</class>
<jar>${nameNode}/user/${wf:user()}/${examplesRoot}/apps/spark/lib/oozie-examples.jar</jar>
@@ -39,4 +39,4 @@
</message>
</kill>
<end name='end' />
-</workflow-app>
\ No newline at end of file
+</workflow-app>
http://git-wip-us.apache.org/repos/asf/oozie/blob/a5c9829d/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index ad383fd..9fb9841 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.2.0 release (trunk - unreleased)
+OOZIE-2164 make master parameterizable in Spark action example (wypoon via rkanter)
OOZIE-2155 Incorrect DST Shifts are occurring based on the Database timezone (rkanter)
OOZIE-2156 override hive.querylog.location in hive-site.xml (ryota)
OOZIE-2153 modify HCatCredentialHelper to use HCatClient (ryota)