spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pwend...@apache.org
Subject git commit: SPARK-3259 - User data should be given to the master
Date Wed, 27 Aug 2014 19:43:26 GMT
Repository: spark
Updated Branches:
  refs/heads/master d8298c46b -> 5ac4093c9


SPARK-3259 - User data should be given to the master

Author: Allan Douglas R. de Oliveira <allan@chaordicsystems.com>

Closes #2162 from douglaz/user_data_master and squashes the following commits:

10d15f6 [Allan Douglas R. de Oliveira] Give user data also to the master


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5ac4093c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5ac4093c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5ac4093c

Branch: refs/heads/master
Commit: 5ac4093c9fa29a11e38f884eebb3f5db087de76f
Parents: d8298c4
Author: Allan Douglas R. de Oliveira <allan@chaordicsystems.com>
Authored: Wed Aug 27 12:43:22 2014 -0700
Committer: Patrick Wendell <pwendell@gmail.com>
Committed: Wed Aug 27 12:43:22 2014 -0700

----------------------------------------------------------------------
 ec2/spark_ec2.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/5ac4093c/ec2/spark_ec2.py
----------------------------------------------------------------------
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index 77a246f..ddd72a0 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -458,7 +458,8 @@ def launch_cluster(conn, opts, cluster_name):
                                placement=opts.zone,
                                min_count=1,
                                max_count=1,
-                               block_device_map=block_map)
+                               block_device_map=block_map,
+                               user_data=user_data_content)
         master_nodes = master_res.instances
         print "Launched master in %s, regid = %s" % (zone, master_res.id)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message