Skip to content
Snippets Groups Projects
Commit cb6be5bd authored by Dmitriy Lyubimov's avatar Dmitriy Lyubimov
Browse files

Merge remote-tracking branch 'mesos/master' into SPARK-826 

Conflicts:
	core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala
	core/src/main/scala/spark/scheduler/local/LocalTaskSetManager.scala
	core/src/test/scala/spark/KryoSerializerSuite.scala
parents 28f1550f 3097d75d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 530 additions and 385 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment