You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2014/03/27 01:41:55 UTC
git commit: Corrected windows scripts to match their shell
counterparts.
Repository: spark
Updated Branches:
refs/heads/scala-2.10 7ac944fc2 -> 955cf5ffc
Corrected windows scripts to match their shell counterparts.
Applied from incubator-spark:scala-2.10
Author: Martin Tapp <ma...@kronos.com>
Closes #239 from doctapp/scala-2.10 and squashes the following commits:
4b6a983 [Martin Tapp] Corrected windows scripts to match their shell counterparts.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/955cf5ff
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/955cf5ff
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/955cf5ff
Branch: refs/heads/scala-2.10
Commit: 955cf5ffc887044716ee2c80d5989accbd8c2cd1
Parents: 7ac944f
Author: Martin Tapp <ma...@kronos.com>
Authored: Wed Mar 26 17:41:49 2014 -0700
Committer: Tathagata Das <ta...@gmail.com>
Committed: Wed Mar 26 17:41:49 2014 -0700
----------------------------------------------------------------------
sbt/sbt.cmd | 2 +-
spark-class2.cmd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/955cf5ff/sbt/sbt.cmd
----------------------------------------------------------------------
diff --git a/sbt/sbt.cmd b/sbt/sbt.cmd
index 681fe00..ef506fd 100644
--- a/sbt/sbt.cmd
+++ b/sbt/sbt.cmd
@@ -22,4 +22,4 @@ if not "%MESOS_HOME%x"=="x" set EXTRA_ARGS=-Djava.library.path=%MESOS_HOME%\lib\
set SPARK_HOME=%~dp0..
-java -Xmx1200M -XX:MaxPermSize=200m -XX:ReservedCodeCacheSize=256m %EXTRA_ARGS% -jar %SPARK_HOME%\sbt\sbt-launch-0.11.3-2.jar "%*"
+java -Xmx1200M -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=256m %EXTRA_ARGS% -jar %SPARK_HOME%\sbt\sbt-launch-0.11.3-2.jar "%*"
http://git-wip-us.apache.org/repos/asf/spark/blob/955cf5ff/spark-class2.cmd
----------------------------------------------------------------------
diff --git a/spark-class2.cmd b/spark-class2.cmd
index 3869d07..f073c56 100644
--- a/spark-class2.cmd
+++ b/spark-class2.cmd
@@ -17,7 +17,7 @@ rem See the License for the specific language governing permissions and
rem limitations under the License.
rem
-set SCALA_VERSION=2.9.3
+set SCALA_VERSION=2.10
rem Figure out where the Spark framework is installed
set FWDIR=%~dp0