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

f4dc9d37

Commit f4dc9d37 authored 11 years ago by Reynold Xin

Downloads
- Plain Diff

Merge branch 'master' of github.com:mesos/spark

parents 3443d3fd 834686b1

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/org/apache/spark/SparkContext.scala 6 additions, 1 deletion

core/src/main/scala/org/apache/spark/SparkContext.scala
core/src/main/scala/org/apache/spark/scheduler/cluster/SchedulableBuilder.scala 56 additions, 43 deletions

...g/apache/spark/scheduler/cluster/SchedulableBuilder.scala
core/src/test/scala/org/apache/spark/LocalSparkContext.scala 5 additions, 5 deletions

core/src/test/scala/org/apache/spark/LocalSparkContext.scala
core/src/test/scala/org/apache/spark/SharedSparkContext.scala 2 additions, 4 deletions

.../src/test/scala/org/apache/spark/SharedSparkContext.scala
core/src/test/scala/org/apache/spark/ThreadingSuite.scala 44 additions, 1 deletion

core/src/test/scala/org/apache/spark/ThreadingSuite.scala
ec2/spark_ec2.py 4 additions, 4 deletions

ec2/spark_ec2.py
spark-class 6 additions, 6 deletions

spark-class

with 123 additions and 64 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