diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-06-27 15:21:54 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-06-27 15:21:54 -0700 |
| commit | 7d0eae17e3edbdf3713856c95c48d1f0e76eb87a (patch) | |
| tree | 897bf726941e95a77e3759d42509a59c96393203 /run | |
| parent | 6aacaa68706aa6956585d1d2f46a5d2905541a39 (diff) | |
| parent | 06aac8a88902f10182830259197d83adbafea516 (diff) | |
| download | spark-7d0eae17e3edbdf3713856c95c48d1f0e76eb87a.tar.gz spark-7d0eae17e3edbdf3713856c95c48d1f0e76eb87a.tar.bz2 spark-7d0eae17e3edbdf3713856c95c48d1f0e76eb87a.zip | |
Merge branch 'dev'
Conflicts:
src/scala/spark/HdfsFile.scala
src/scala/spark/NexusScheduler.scala
src/test/spark/repl/ReplSuite.scala
Diffstat (limited to 'run')
| -rwxr-xr-x | run | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4,7 +4,7 @@ FWDIR=`dirname $0` # Set JAVA_OPTS to be able to load libnexus.so and set various other misc options -JAVA_OPTS="-Djava.library.path=$FWDIR/third_party:$FWDIR/src/native -Xmx750m" +export JAVA_OPTS="-Djava.library.path=$FWDIR/third_party:$FWDIR/src/native -Xms100m -Xmx750m" if [ -e $FWDIR/conf/java-opts ] ; then JAVA_OPTS+=" `cat $FWDIR/conf/java-opts`" fi |