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

3ee2530c

Commit 3ee2530c authored 12 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge branch 'block-manager-fix' into dev

parents 400221f8 ed1b0f83

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/SparkEnv.scala 3 additions, 3 deletions

core/src/main/scala/spark/SparkEnv.scala
core/src/main/scala/spark/scheduler/DAGScheduler.scala 1 addition, 1 deletion

core/src/main/scala/spark/scheduler/DAGScheduler.scala
core/src/main/scala/spark/storage/BlockManager.scala 15 additions, 17 deletions

core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/BlockManagerMaster.scala 17 additions, 19 deletions

core/src/main/scala/spark/storage/BlockManagerMaster.scala
core/src/main/scala/spark/storage/BlockManagerWorker.scala 3 additions, 3 deletions

core/src/main/scala/spark/storage/BlockManagerWorker.scala
core/src/main/scala/spark/storage/BlockMessage.scala 10 additions, 10 deletions

core/src/main/scala/spark/storage/BlockMessage.scala
core/src/main/scala/spark/storage/BlockMessageArray.scala 3 additions, 3 deletions

core/src/main/scala/spark/storage/BlockMessageArray.scala
core/src/main/scala/spark/storage/StorageLevel.scala 10 additions, 13 deletions

core/src/main/scala/spark/storage/StorageLevel.scala
core/src/test/scala/spark/storage/BlockManagerSuite.scala 21 additions, 19 deletions

core/src/test/scala/spark/storage/BlockManagerSuite.scala

with 83 additions and 88 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