aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2012-09-13 17:19:26 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2012-09-13 17:19:26 -0700
commit840cbcf849c27367bf2d8d316be8846f5a623d5d (patch)
tree433123bc4c77953a927a4668199cfd7e77fe9d47
parent77a0ee99fa75d6a501d49683dac8c9a352c431fc (diff)
downloadspark-840cbcf849c27367bf2d8d316be8846f5a623d5d.tar.gz
spark-840cbcf849c27367bf2d8d316be8846f5a623d5d.tar.bz2
spark-840cbcf849c27367bf2d8d316be8846f5a623d5d.zip
Change default serializer to Java.. it had accidentally become Kryo.
-rw-r--r--core/src/main/scala/spark/SparkEnv.scala2
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)