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

Merge branch 'master' into multi-tracker

Conflicts:
	Makefile
	run
	src/scala/spark/Broadcast.scala
	src/scala/spark/HdfsFile.scala
	src/scala/spark/NexusScheduler.scala
	src/scala/spark/SparkContext.scala
	src/test/spark/repl/ReplSuite.scala
	third_party/nexus.jar
parents 7ab70311 7d0eae17
No related branches found
No related tags found
No related merge requests found
Showing
with 513 additions and 466 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