diff options
| author | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2012-12-29 16:00:51 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2012-12-29 16:00:51 -0800 |
| commit | c5cee53f2092ee2825095a1831ca47f1c41afc2f (patch) | |
| tree | 29c36f14668e67493b2c8ed98cb4d4124baf841e /bin/start-all.sh | |
| parent | 26186e2d259f3aa2db9c8594097fd342107ce147 (diff) | |
| parent | 3f74f729a190924b7634e08a381232af36aeb328 (diff) | |
| download | spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.tar.gz spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.tar.bz2 spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.zip | |
Merge remote-tracking branch 'origin/master' into python-api
Conflicts:
docs/quick-start.md
Diffstat (limited to 'bin/start-all.sh')
| -rwxr-xr-x | bin/start-all.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/start-all.sh b/bin/start-all.sh index 9bd6c50654..b9891ad2f6 100755 --- a/bin/start-all.sh +++ b/bin/start-all.sh @@ -11,7 +11,7 @@ bin=`cd "$bin"; pwd` . "$bin/spark-config.sh" # Start Master -"$bin"/start-master.sh --config $SPARK_CONF_DIR +"$bin"/start-master.sh # Start Workers -"$bin"/start-slaves.sh --config $SPARK_CONF_DIR
\ No newline at end of file +"$bin"/start-slaves.sh |