Skip to content
Snippets Groups Projects
Commit f8d245bd authored by Patrick Wendell's avatar Patrick Wendell
Browse files

Merge remote-tracking branch 'apache-github/master' into log4j-fix-2

Conflicts:
	streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
parents 37c43c9d 9a0ff721
No related branches found
No related tags found
No related merge requests found
Showing
with 433 additions and 307 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