Skip to content
Snippets Groups Projects
Commit 1ffadb2d authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Merge remote-tracking branch 'pwendell/ui-updates' 

Conflicts:
	core/src/main/scala/spark/scheduler/DAGScheduler.scala
	core/src/main/scala/spark/util/AkkaUtils.scala
	pom.xml
parents 94871e47 37abe842
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 457 additions and 220 deletions
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