diff options
| author | Mosharaf Chowdhury <mosharaf@mosharaf-ubuntu.(none)> | 2010-10-18 11:08:45 -0700 |
|---|---|---|
| committer | Mosharaf Chowdhury <mosharaf@mosharaf-ubuntu.(none)> | 2010-10-18 11:08:45 -0700 |
| commit | bf7055decfefe29ab6123af8384a04effebcb9ab (patch) | |
| tree | d2fdf8799e105c9364045ddb2b6d776df75a19f7 /conf/java-opts.template | |
| parent | ad7a9c5a3695f1f83cbdfa96d435003939582c8a (diff) | |
| parent | b940164db38ced59dcd26b91e41f20e5c1f56cc2 (diff) | |
| download | spark-bf7055decfefe29ab6123af8384a04effebcb9ab.tar.gz spark-bf7055decfefe29ab6123af8384a04effebcb9ab.tar.bz2 spark-bf7055decfefe29ab6123af8384a04effebcb9ab.zip | |
Merge branch 'master' of git@github.com:mesos/spark
Conflicts:
src/scala/spark/SparkContext.scala
Using the latest one from Matei.
Diffstat (limited to 'conf/java-opts.template')
| -rw-r--r-- | conf/java-opts.template | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/java-opts.template b/conf/java-opts.template new file mode 100644 index 0000000000..b61e8163b5 --- /dev/null +++ b/conf/java-opts.template @@ -0,0 +1 @@ +-Dspark.broadcast.masterHostAddress=127.0.0.1 -Dspark.broadcast.masterTrackerPort=11111 -Dspark.broadcast.blockSize=1024 -Dspark.broadcast.maxRetryCount=2 -Dspark.broadcast.serverSocketTimout=50000 -Dspark.broadcast.dualMode=false |