diff options
| author | Andrew xia <junluan.xia@intel.com> | 2013-05-18 07:28:03 +0800 |
|---|---|---|
| committer | Andrew xia <junluan.xia@intel.com> | 2013-05-18 07:28:03 +0800 |
| commit | 3d4672eaa9ebda0a2510a84087bb5bc6d15fc99c (patch) | |
| tree | 35eccf20202808964fa07ea7b48085c511e33128 /bin/stop-master.sh | |
| parent | d19753b9c78857acae441dce3133fbb6c5855f95 (diff) | |
| parent | 6c27c38451a9f7b7f870949d2838bc8f78f09892 (diff) | |
| download | spark-3d4672eaa9ebda0a2510a84087bb5bc6d15fc99c.tar.gz spark-3d4672eaa9ebda0a2510a84087bb5bc6d15fc99c.tar.bz2 spark-3d4672eaa9ebda0a2510a84087bb5bc6d15fc99c.zip | |
Merge branch 'master' into xiajunluan
Conflicts:
core/src/main/scala/spark/SparkContext.scala
core/src/main/scala/spark/scheduler/cluster/ClusterScheduler.scala
core/src/main/scala/spark/scheduler/cluster/TaskSetManager.scala
Diffstat (limited to 'bin/stop-master.sh')
| -rwxr-xr-x | bin/stop-master.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/stop-master.sh b/bin/stop-master.sh index f75167dd2c..172ee5891d 100755 --- a/bin/stop-master.sh +++ b/bin/stop-master.sh @@ -7,4 +7,4 @@ bin=`cd "$bin"; pwd` . "$bin/spark-config.sh" -"$bin"/spark-daemon.sh stop spark.deploy.master.Master
\ No newline at end of file +"$bin"/spark-daemon.sh stop spark.deploy.master.Master 1 |