Matei Zaharia d54b10b6ad Merge remote-tracking branch 'stephenh/removefailedjob' ... Conflicts: core/src/main/scala/spark/deploy/master/Master.scala		2013-01-29 18:12:29 -08:00
..
src	Merge remote-tracking branch 'stephenh/removefailedjob'	2013-01-29 18:12:29 -08:00
pom.xml	Add missing dependency spray-json to Maven build	2013-01-13 00:46:25 -08:00