Merge pull request #393 from pwendell/revert-381

Revert PR 381

This PR missed a bunch of test cases that require "spark.cleaner.ttl". I think it is what is causing test failures on Jenkins right now (though it's a bit hard to tell because the DNS for cs.berkeley.edu is down).

I'm submitting this to see if it fixes jeknins. I did try just patching various tests but it was taking a really long time because there are a bunch of them, so for now I'm just seeing if a revert works.

core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala

@@ -74,7 +74,7 @@ object MetadataCleanerType extends Enumeration {
 // initialization of StreamingContext. It's okay for users trying to configure stuff themselves.
 object MetadataCleaner {
   def getDelaySeconds(conf: SparkConf) = {
-    conf.getInt("spark.cleaner.ttl", -1)
+    conf.getInt("spark.cleaner.ttl", 3500)
   }
 
   def getDelaySeconds(conf: SparkConf, cleanerType: MetadataCleanerType.MetadataCleanerType): Int =

streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala

@@ -375,7 +375,7 @@ class BasicOperationsSuite extends TestSuiteBase {
   }
 
   test("slice") {
-    val conf2 = conf.clone()
+    val conf2 = new SparkConf()
       .setMaster("local[2]")
       .setAppName("BasicOperationsSuite")
       .set("spark.streaming.clock", "org.apache.spark.streaming.util.ManualClock")