Skip to content
Snippets Groups Projects
  • Prashant Sharma's avatar
    980afd28
    Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into... · 980afd28
    Prashant Sharma authored
    Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into spark-915-segregate-scripts
    
    Conflicts:
    	bin/spark-shell
    	core/pom.xml
    	core/src/main/scala/org/apache/spark/SparkContext.scala
    	core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
    	core/src/main/scala/org/apache/spark/ui/UIWorkloadGenerator.scala
    	core/src/test/scala/org/apache/spark/DriverSuite.scala
    	python/run-tests
    	sbin/compute-classpath.sh
    	sbin/spark-class
    	sbin/stop-slaves.sh
    980afd28
    History
    Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into...
    Prashant Sharma authored
    Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into spark-915-segregate-scripts
    
    Conflicts:
    	bin/spark-shell
    	core/pom.xml
    	core/src/main/scala/org/apache/spark/SparkContext.scala
    	core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
    	core/src/main/scala/org/apache/spark/ui/UIWorkloadGenerator.scala
    	core/src/test/scala/org/apache/spark/DriverSuite.scala
    	python/run-tests
    	sbin/compute-classpath.sh
    	sbin/spark-class
    	sbin/stop-slaves.sh