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

Merge remote-tracking branch 'apache/master' into conf2

Conflicts:
	core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala
	streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
	streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
parents 0fa58097 63b411dd
No related branches found
No related tags found
No related merge requests found
Showing
with 121 additions and 108 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