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

2bfd7931

Commit 2bfd7931 authored 13 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge branch 'new-rdds-protobuf'

Conflicts:
	core/src/main/scala/spark/Executor.scala
	core/src/main/scala/spark/RDD.scala

parents 02678724 4096c228

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

core/lib/mesos.jar 0 additions, 0 deletions

core/lib/mesos.jar
core/src/main/scala/spark/Executor.scala 40 additions, 20 deletions

core/src/main/scala/spark/Executor.scala
core/src/main/scala/spark/HadoopRDD.scala 0 additions, 2 deletions

core/src/main/scala/spark/HadoopRDD.scala
core/src/main/scala/spark/Job.scala 3 additions, 2 deletions

core/src/main/scala/spark/Job.scala
core/src/main/scala/spark/MesosScheduler.scala 53 additions, 23 deletions

core/src/main/scala/spark/MesosScheduler.scala
core/src/main/scala/spark/ParallelCollection.scala 0 additions, 2 deletions

core/src/main/scala/spark/ParallelCollection.scala
core/src/main/scala/spark/SimpleJob.scala 37 additions, 19 deletions

core/src/main/scala/spark/SimpleJob.scala
core/src/main/scala/spark/Task.scala 0 additions, 2 deletions

core/src/main/scala/spark/Task.scala
project/build/SparkProject.scala 1 addition, 0 deletions

project/build/SparkProject.scala

with 134 additions and 70 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