Prashant Sharma 383e151fd7 Merge branch 'master' of git://github.com/mesos/spark into scala-2.10 ... Conflicts: core/src/main/scala/org/apache/spark/SparkContext.scala project/SparkBuild.scala		2013-09-15 10:55:12 +05:30
..
src/main	Merged with master	2013-09-06 17:53:01 +05:30
pom.xml	Merge branch 'master' of git://github.com/mesos/spark into scala-2.10	2013-09-15 10:55:12 +05:30