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 /sbt | |
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 'sbt')
-rwxr-xr-x | sbt/sbt | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5,4 +5,4 @@ if [ "$MESOS_HOME" != "" ]; then fi export SPARK_HOME=$(cd "$(dirname $0)/.."; pwd) export SPARK_TESTING=1 # To put test classes on classpath -java -Xmx1200M -XX:MaxPermSize=250m $EXTRA_ARGS -jar $SPARK_HOME/sbt/sbt-launch-*.jar "$@" +java -Xmx1200m -XX:MaxPermSize=250m -XX:ReservedCodeCacheSize=128m $EXTRA_ARGS -jar $SPARK_HOME/sbt/sbt-launch-*.jar "$@" |