aboutsummaryrefslogtreecommitdiff
path: root/streaming/src
diff options
context:
space:
mode:
authorTathagata Das <tathagata.das1565@gmail.com>2014-01-13 17:29:19 -0800
committerTathagata Das <tathagata.das1565@gmail.com>2014-01-13 17:29:19 -0800
commit1233b3de01be1ff57910786f5f3e2e2a23e228ab (patch)
treec70619e76241ff45728469fdcde8490581b012df /streaming/src
parentc0bb38e8aa36c53e96a64b9bf8d2c8b020e93663 (diff)
parent01c0d72b322544665c51a9066b870fd723dbd3d2 (diff)
downloadspark-1233b3de01be1ff57910786f5f3e2e2a23e228ab.tar.gz
spark-1233b3de01be1ff57910786f5f3e2e2a23e228ab.tar.bz2
spark-1233b3de01be1ff57910786f5f3e2e2a23e228ab.zip
Merge remote-tracking branch 'apache/master' into filestream-fix
Diffstat (limited to 'streaming/src')
-rw-r--r--streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala b/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
index a2f0b88cb0..108950466a 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
@@ -132,7 +132,7 @@ class JavaStreamingContext(val ssc: StreamingContext) {
* Re-creates a StreamingContext from a checkpoint file.
* @param path Path to the directory that was specified as the checkpoint directory
*/
- def this(path: String) = this(new StreamingContext(path))
+ def this(path: String) = this(new StreamingContext(path, new Configuration))
/**
* Re-creates a StreamingContext from a checkpoint file.