diff options
| author | Mridul Muralidharan <mridul@gmail.com> | 2013-04-24 09:24:17 +0530 |
|---|---|---|
| committer | Mridul Muralidharan <mridul@gmail.com> | 2013-04-24 09:24:17 +0530 |
| commit | dd515ca3ee011cbf9b6941bb45afc55fd905fda8 (patch) | |
| tree | 284b4c31d0d7c8c06b4f78125ddb50037ee50630 /bin/start-master.sh | |
| parent | adcda84f9646f12e6d5fb4f1e5e3a1b0a98b7c9f (diff) | |
| parent | 17e076de800ea0d4c55f2bd657348641f6f9c55b (diff) | |
| download | spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.tar.gz spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.tar.bz2 spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.zip | |
Attempt at fixing merge conflict
Diffstat (limited to 'bin/start-master.sh')
| -rwxr-xr-x | bin/start-master.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/start-master.sh b/bin/start-master.sh index 87feb261fe..83a3e1f3dc 100755 --- a/bin/start-master.sh +++ b/bin/start-master.sh @@ -32,4 +32,4 @@ if [ "$SPARK_PUBLIC_DNS" = "" ]; then fi fi -"$bin"/spark-daemon.sh start spark.deploy.master.Master --ip $SPARK_MASTER_IP --port $SPARK_MASTER_PORT --webui-port $SPARK_MASTER_WEBUI_PORT +"$bin"/spark-daemon.sh start spark.deploy.master.Master 1 --ip $SPARK_MASTER_IP --port $SPARK_MASTER_PORT --webui-port $SPARK_MASTER_WEBUI_PORT |