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

a59cc606

Commit a59cc606 authored 12 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge remote-tracking branch 'stephenh/nomocks'

Conflicts:
	core/src/main/scala/spark/storage/BlockManagerMaster.scala
	core/src/test/scala/spark/scheduler/DAGSchedulerSuite.scala

parents 9f0dc829 db957e5b

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/MapOutputTracker.scala 4 additions, 14 deletions

core/src/main/scala/spark/MapOutputTracker.scala
core/src/main/scala/spark/SparkEnv.scala 24 additions, 7 deletions

core/src/main/scala/spark/SparkEnv.scala
core/src/main/scala/spark/scheduler/DAGScheduler.scala 21 additions, 16 deletions

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

core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/BlockManagerMaster.scala 2 additions, 20 deletions

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

core/src/main/scala/spark/storage/ThreadingTest.scala
core/src/test/scala/spark/MapOutputTrackerSuite.scala 34 additions, 30 deletions

core/src/test/scala/spark/MapOutputTrackerSuite.scala
core/src/test/scala/spark/scheduler/DAGSchedulerSuite.scala 184 additions, 443 deletions

core/src/test/scala/spark/scheduler/DAGSchedulerSuite.scala
core/src/test/scala/spark/storage/BlockManagerSuite.scala 2 additions, 1 deletion

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

with 275 additions and 536 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