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

ec193c7d

Commit ec193c7d authored 11 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge remote-tracking branch 'xiajunluan/xiajunluan'

Conflicts:
	core/src/main/scala/spark/scheduler/cluster/TaskSetManager.scala

parents e6d12773 53add598

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/scheduler/cluster/ClusterScheduler.scala 1 addition, 1 deletion

...main/scala/spark/scheduler/cluster/ClusterScheduler.scala
core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala 747 additions, 0 deletions

...scala/spark/scheduler/cluster/ClusterTaskSetManager.scala
core/src/main/scala/spark/scheduler/cluster/TaskSetManager.scala 9 additions, 739 deletions

...c/main/scala/spark/scheduler/cluster/TaskSetManager.scala
core/src/main/scala/spark/scheduler/local/LocalScheduler.scala 153 additions, 74 deletions

...src/main/scala/spark/scheduler/local/LocalScheduler.scala
core/src/main/scala/spark/scheduler/local/LocalTaskSetManager.scala 172 additions, 0 deletions

...ain/scala/spark/scheduler/local/LocalTaskSetManager.scala
core/src/test/scala/spark/scheduler/ClusterSchedulerSuite.scala 1 addition, 1 deletion

...rc/test/scala/spark/scheduler/ClusterSchedulerSuite.scala
core/src/test/scala/spark/scheduler/LocalSchedulerSuite.scala 206 additions, 0 deletions

.../src/test/scala/spark/scheduler/LocalSchedulerSuite.scala

with 1289 additions and 815 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