diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-10-19 13:58:52 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-10-19 13:58:52 -0700 |
| commit | 0e0ec8357011f3daa86616138abea99a621f1913 (patch) | |
| tree | cbfac2e588aa0d69ad835e8b75f9da13f72de727 /conf | |
| parent | bf7055decfefe29ab6123af8384a04effebcb9ab (diff) | |
| download | spark-0e0ec8357011f3daa86616138abea99a621f1913.tar.gz spark-0e0ec8357011f3daa86616138abea99a621f1913.tar.bz2 spark-0e0ec8357011f3daa86616138abea99a621f1913.zip | |
Undid some changes that Mosharaf inadvertedly committed to master.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/java-opts.template | 1 | ||||
| -rwxr-xr-x | conf/spark-env.sh.template | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/conf/java-opts.template b/conf/java-opts.template index b61e8163b5..e69de29bb2 100644 --- a/conf/java-opts.template +++ b/conf/java-opts.template @@ -1 +0,0 @@ --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 diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template index 77f9cb69b9..6852b23a34 100755 --- a/conf/spark-env.sh.template +++ b/conf/spark-env.sh.template @@ -10,4 +10,4 @@ # be in the same format as the JVM's -Xmx option, e.g. 300m or 1g). # - SPARK_LIBRARY_PATH, to add extra search paths for native libraries. -MESOS_HOME=/home/mosharaf/Work/mesos + |