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

8c01295b

Commit 8c01295b authored 12 years ago by Reynold Xin

Downloads
- Patches
- Plain Diff

Fixed conflicts from merging Charles' and TD's block manager changes.

parent 0235667f

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/storage/BlockManagerMaster.scala 0 additions, 1 deletion

core/src/main/scala/spark/storage/BlockManagerMaster.scala
core/src/main/scala/spark/storage/BlockManagerMasterActor.scala 154 additions, 145 deletions

...rc/main/scala/spark/storage/BlockManagerMasterActor.scala
core/src/test/scala/spark/storage/BlockManagerSuite.scala 4 additions, 27 deletions

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

with 158 additions and 173 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