diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-06 17:29:21 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-06 17:29:21 -0800 |
| commit | c0498f9265e32ba82bcf48bf0df0f29c6cfea587 (patch) | |
| tree | 55cce48bc1b7dcc4645715d06256c9923d6dd922 /ec2/spark_ec2.py | |
| parent | f236ddd1a245a587d5ee331fb67cf41456ed383c (diff) | |
| parent | e4d6057b6692ca5f071819b4ec6eb5240a0a16bc (diff) | |
| download | spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.tar.gz spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.tar.bz2 spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.zip | |
Merge remote-tracking branch 'apache-github/master' into standalone-driver
Conflicts:
core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
core/src/main/scala/org/apache/spark/deploy/client/TestClient.scala
core/src/main/scala/org/apache/spark/deploy/master/Master.scala
core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
Diffstat (limited to 'ec2/spark_ec2.py')
| -rwxr-xr-x | ec2/spark_ec2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index a2b0e7e7f4..d82a1e1490 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -436,7 +436,7 @@ def setup_cluster(conn, master_nodes, slave_nodes, opts, deploy_ssh_key): def setup_standalone_cluster(master, slave_nodes, opts): slave_ips = '\n'.join([i.public_dns_name for i in slave_nodes]) ssh(master, opts, "echo \"%s\" > spark/conf/slaves" % (slave_ips)) - ssh(master, opts, "/root/spark/bin/start-all.sh") + ssh(master, opts, "/root/spark/sbin/start-all.sh") def setup_spark_cluster(master, opts): ssh(master, opts, "chmod u+x spark-ec2/setup.sh") |