Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

spark
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

1cb3eb97

Commit 1cb3eb97 authored 12 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge remote-tracking branch 'kalpit/master'

Conflicts:
	project/SparkBuild.scala

parents a1586412 aa9134f7

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

bin/spark-daemon.sh 6 additions, 4 deletions

bin/spark-daemon.sh
bin/spark-daemons.sh 1 addition, 1 deletion

bin/spark-daemons.sh
bin/start-master.sh 1 addition, 1 deletion

bin/start-master.sh
bin/start-slave.sh 1 addition, 1 deletion

bin/start-slave.sh
bin/start-slaves.sh 10 additions, 1 deletion

bin/start-slaves.sh
bin/stop-master.sh 1 addition, 1 deletion

bin/stop-master.sh
bin/stop-slaves.sh 11 additions, 1 deletion

bin/stop-slaves.sh
conf/spark-env.sh.template 1 addition, 0 deletions

conf/spark-env.sh.template
project/SparkBuild.scala 2 additions, 2 deletions

project/SparkBuild.scala
project/build.properties 1 addition, 1 deletion

project/build.properties
project/plugins.sbt 3 additions, 3 deletions

project/plugins.sbt
run 1 addition, 1 deletion

run
run2.cmd 1 addition, 1 deletion

run2.cmd

with 40 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment