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

Merge branch 'master' into mesos-0.9

Conflicts:
	core/src/main/scala/spark/Executor.scala
parents bd2ab635 1dd7d3df
No related branches found
No related tags found
No related merge requests found
Showing
with 401 additions and 169 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