diff options
| author | Andy Konwinski <andyk@berkeley.edu> | 2012-09-16 15:29:35 -0700 |
|---|---|---|
| committer | Andy Konwinski <andyk@berkeley.edu> | 2012-09-16 15:31:30 -0700 |
| commit | 8f7dfcf332b0e56bb0d7e0b97b60a6cb4a8735d1 (patch) | |
| tree | 3bd417a9f51092761b59a3301b8ab22ada74714d | |
| parent | 52c29071a4ea59493206f5a6f00feefc22941e72 (diff) | |
| parent | bcd7b40578f9aaf8618a4408308b3721cf6afb79 (diff) | |
| download | spark-8f7dfcf332b0e56bb0d7e0b97b60a6cb4a8735d1.tar.gz spark-8f7dfcf332b0e56bb0d7e0b97b60a6cb4a8735d1.tar.bz2 spark-8f7dfcf332b0e56bb0d7e0b97b60a6cb4a8735d1.zip | |
Merge remote-tracking branch 'public-spark/dev' into doc
| -rw-r--r-- | core/src/main/scala/spark/SparkEnv.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/SparkEnv.scala b/core/src/main/scala/spark/SparkEnv.scala index b9efdbde64..7473b40aa3 100644 --- a/core/src/main/scala/spark/SparkEnv.scala +++ b/core/src/main/scala/spark/SparkEnv.scala @@ -72,7 +72,7 @@ object SparkEnv { System.setProperty("spark.master.port", boundPort.toString) } - val serializerClass = System.getProperty("spark.serializer", "spark.KryoSerializer") + val serializerClass = System.getProperty("spark.serializer", "spark.JavaSerializer") val serializer = Class.forName(serializerClass).newInstance().asInstanceOf[Serializer] val blockManagerMaster = new BlockManagerMaster(actorSystem, isMaster, isLocal) |