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

Merge branch 'master' of https://github.com/mesos/spark

parents 108cfaa5 4223be3a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
streaming/src/main/scala/spark/streaming/StreamingContext.scala
+ 1
− 1
View file @ c6380b17
...@@ -505,7 +505,7 @@ object StreamingContext { ...@@ -505,7 +505,7 @@ object StreamingContext {
if (MetadataCleaner.getDelaySeconds < 0) { if (MetadataCleaner.getDelaySeconds < 0) {
MetadataCleaner.setDelaySeconds(3600) MetadataCleaner.setDelaySeconds(3600)
} }
new SparkContext(master, appName) new SparkContext(master, appName, sparkHome, jars, environment)
} }
protected[streaming] def rddToFileName[T](prefix: String, suffix: String, time: Time): String = { protected[streaming] def rddToFileName[T](prefix: String, suffix: String, time: Time): String = {
......
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