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

3097d75d

Commit 3097d75d authored 11 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge remote-tracking branch 'dlyubimov/SPARK-827'

Conflicts:
	docs/configuration.md

parents ecab635a 0862494d

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

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

...scala/spark/scheduler/cluster/ClusterTaskSetManager.scala
docs/configuration.md 8 additions, 0 deletions

docs/configuration.md

with 9 additions and 1 deletion

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