repl/pom.xml · 276c37a51c9a6188dbbe02754935540ace338dd1 · cs525-sp18-g07 / spark · GitLab

Sep 15, 2013
383e151f
Merge branch 'master' of git://github.com/mesos/spark into scala-2.10 · 383e151f
Prashant Sharma authored Sep 15, 2013
```
Conflicts:
	core/src/main/scala/org/apache/spark/SparkContext.scala
	project/SparkBuild.scala
```
383e151f
Merge branch 'master' of git://github.com/mesos/spark into scala-2.10
Prashant Sharma authored Sep 15, 2013
```
Conflicts:
	core/src/main/scala/org/apache/spark/SparkContext.scala
	project/SparkBuild.scala
```