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

0898a21b

Commit 0898a21b authored 12 years ago by Reynold Xin

Downloads
- Plain Diff

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

parents b8cd6811 a9257546

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/storage/BlockManager.scala 104 additions, 118 deletions

core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/BlockStore.scala 0 additions, 2 deletions

core/src/main/scala/spark/storage/BlockStore.scala
core/src/main/scala/spark/storage/DiskStore.scala 1 addition, 5 deletions

core/src/main/scala/spark/storage/DiskStore.scala
core/src/main/scala/spark/storage/MemoryStore.scala 70 additions, 100 deletions

core/src/main/scala/spark/storage/MemoryStore.scala
core/src/test/scala/spark/storage/BlockManagerSuite.scala 3 additions, 3 deletions

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

with 178 additions and 228 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