ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Andy Konwinski 2012-09-16 15:29:35 -07:00
parent 52c29071a4 bcd7b40578
commit a92748d3ba
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/scala/spark/SparkEnv.scala
View file

@ -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)