Skip to content
Snippets Groups Projects
Commit c7b27889 authored by Karen Feng's avatar Karen Feng
Browse files

Merge branch 'master' of https://github.com/mesos/spark into bootstrap-update 

Conflicts:
	core/src/main/scala/spark/ui/jobs/IndexPage.scala
parents 478a2886 c99b6744
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment