Skip to content
Snippets Groups Projects
Commit 58296928 authored by Prashant Sharma's avatar Prashant Sharma
Browse files

Merge branch 'master' into scala-2.10

Conflicts:
	core/src/main/scala/org/apache/spark/ui/jobs/JobProgressUI.scala
	docs/_config.yml
	project/SparkBuild.scala
	repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
parents 9865fd6a 714fdabd
No related branches found
No related tags found
No related merge requests found
Showing
with 55 additions and 30 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment