Kay Ousterhout c06945cfe0 Merge remote branch 'upstream/master' into consolidate_schedulers ... Conflicts: core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala		2013-12-20 14:39:30 -08:00
..
src	Merge remote branch 'upstream/master' into consolidate_schedulers	2013-12-20 14:39:30 -08:00
pom.xml	Use scala.binary.version in POMs	2013-12-15 12:39:58 -08:00