aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-02-25 20:23:41 -0800
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-02-25 20:23:41 -0800
commitc6380b174952dcd0053e8307bb4c3ba34c89e016 (patch)
treef9fa4be55bb499b2174d59c656ae228b012695fd
parent108cfaa5b4905f390c56cd5187c6aa1d6af63300 (diff)
parent4223be3aa475fe938daeec161ca8fbd00fd9c5fa (diff)
downloadspark-c6380b174952dcd0053e8307bb4c3ba34c89e016.tar.gz
spark-c6380b174952dcd0053e8307bb4c3ba34c89e016.tar.bz2
spark-c6380b174952dcd0053e8307bb4c3ba34c89e016.zip
Merge branch 'master' of https://github.com/mesos/spark
-rw-r--r--streaming/src/main/scala/spark/streaming/StreamingContext.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/src/main/scala/spark/streaming/StreamingContext.scala b/streaming/src/main/scala/spark/streaming/StreamingContext.scala
index 31b5d2c8bc..b8b60aab43 100644
--- a/streaming/src/main/scala/spark/streaming/StreamingContext.scala
+++ b/streaming/src/main/scala/spark/streaming/StreamingContext.scala
@@ -505,7 +505,7 @@ object StreamingContext {
if (MetadataCleaner.getDelaySeconds < 0) {
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 = {