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

c68e820b

Commit c68e820b authored 12 years ago by Reynold Xin

Downloads
- Plain Diff

Merge branch 'dev' of github.com:mesos/spark into dev

parents 940869df 47507d69

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/BlockStoreShuffleFetcher.scala 2 additions, 1 deletion

core/src/main/scala/spark/BlockStoreShuffleFetcher.scala
core/src/main/scala/spark/MapOutputTracker.scala 2 additions, 1 deletion

core/src/main/scala/spark/MapOutputTracker.scala
core/src/main/scala/spark/executor/Executor.scala 1 addition, 0 deletions

core/src/main/scala/spark/executor/Executor.scala
core/src/main/scala/spark/network/Connection.scala 2 additions, 2 deletions

core/src/main/scala/spark/network/Connection.scala
core/src/main/scala/spark/network/ConnectionManager.scala 5 additions, 4 deletions

core/src/main/scala/spark/network/ConnectionManager.scala
core/src/main/scala/spark/scheduler/ShuffleMapTask.scala 2 additions, 0 deletions

core/src/main/scala/spark/scheduler/ShuffleMapTask.scala
core/src/main/scala/spark/scheduler/cluster/StandaloneSchedulerBackend.scala 36 additions, 2 deletions

.../spark/scheduler/cluster/StandaloneSchedulerBackend.scala
core/src/main/scala/spark/scheduler/cluster/TaskInfo.scala 2 additions, 0 deletions

core/src/main/scala/spark/scheduler/cluster/TaskInfo.scala
core/src/main/scala/spark/scheduler/cluster/TaskSetManager.scala 12 additions, 2 deletions

...c/main/scala/spark/scheduler/cluster/TaskSetManager.scala
core/src/main/scala/spark/storage/BlockManager.scala 13 additions, 2 deletions

core/src/main/scala/spark/storage/BlockManager.scala
ec2/spark_ec2.py 4 additions, 2 deletions

ec2/spark_ec2.py

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