Repository: spark Updated Branches: refs/heads/branch-1.1 935bffe3b -> 0c94a5b2a
SPARK-3259 - User data should be given to the master Author: Allan Douglas R. de Oliveira <al...@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 (cherry picked from commit 5ac4093c9fa29a11e38f884eebb3f5db087de76f) Signed-off-by: Patrick Wendell <pwend...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0c94a5b2 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0c94a5b2 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0c94a5b2 Branch: refs/heads/branch-1.1 Commit: 0c94a5b2a6c41d061f130e30a2c1ad8e84fcf2b6 Parents: 935bffe Author: Allan Douglas R. de Oliveira <al...@chaordicsystems.com> Authored: Wed Aug 27 12:43:22 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Wed Aug 27 12:43:29 2014 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/0c94a5b2/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index a979891..58261e2 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -444,7 +444,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-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
