Skip to content
Snippets Groups Projects
Commit a92748d3 authored by Andy Konwinski's avatar Andy Konwinski
Browse files

Merge remote-tracking branch 'public-spark/dev' into doc

parents 52c29071 bcd7b405
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment