rebase to sparkcontext change

nemccarthy · May 1, 2015 · ffb8e00 · ffb8e00
1 parent 6e121e0
commit ffb8e00
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -252,7 +252,6 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
   val extBlkFolderName = "spark-" + randomUUID.toString()
   @deprecated("Use extBlkFolderName instead.", "1.4.0")
   val tachyonFolderName = extBlkFolderName
-  conf.set("spark.extBlkStore.folderName", extBlkFolderName)
 
   def isLocal: Boolean = (master == "local" || master.startsWith("local["))
 
@@ -389,7 +388,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
       }
     }
 
-    _conf.set("spark.tachyonStore.folderName", tachyonFolderName)
+    _conf.set("spark.extBlkStore.folderName", extBlkFolderName)
 
     if (master == "yarn-client") System.setProperty("SPARK_YARN_MODE", "true")