aboutsummaryrefslogtreecommitdiff
path: root/streaming/src
diff options
context:
space:
mode:
authorMatei Zaharia <matei@databricks.com>2014-01-10 18:53:03 -0800
committerMatei Zaharia <matei@databricks.com>2014-01-10 18:53:03 -0800
commit1d7bef0c91abe053570e006917185d3b4ae19b0e (patch)
treefbba856769e27c39dfdc5946ca66e25cf1ba1604 /streaming/src
parent44d6a8e3d803e6d6b78044a4060c54558f90ef57 (diff)
parent942c80b34c4642de3b0237761bc1aaeb8cbdd546 (diff)
downloadspark-1d7bef0c91abe053570e006917185d3b4ae19b0e.tar.gz
spark-1d7bef0c91abe053570e006917185d3b4ae19b0e.tar.bz2
spark-1d7bef0c91abe053570e006917185d3b4ae19b0e.zip
Merge pull request #381 from mateiz/default-ttl
Fix default TTL for metadata cleaner It seems to have been set to 3500 in a previous commit for debugging, but it should be off by default.
Diffstat (limited to 'streaming/src')
-rw-r--r--streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala
index ee6b433d1f..5ccef7f461 100644
--- a/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala
+++ b/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala
@@ -375,7 +375,7 @@ class BasicOperationsSuite extends TestSuiteBase {
}
test("slice") {
- val conf2 = new SparkConf()
+ val conf2 = conf.clone()
.setMaster("local[2]")
.setAppName("BasicOperationsSuite")
.set("spark.streaming.clock", "org.apache.spark.streaming.util.ManualClock")