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

cd28d9c1

Commit cd28d9c1 authored 11 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/pr/662'

Conflicts:
	bin/compute-classpath.sh

parents 1889f9f4 1107b4d5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

bin/compute-classpath.sh 62 additions, 49 deletions

bin/compute-classpath.sh
bin/start-slave.sh 3 additions, 0 deletions

bin/start-slave.sh
make-distribution.sh 39 additions, 0 deletions

make-distribution.sh
project/SparkBuild.scala 1 addition, 1 deletion

project/SparkBuild.scala
run 16 additions, 28 deletions

run
spark-shell 64 additions, 3 deletions

spark-shell

with 185 additions and 81 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