diff options
author | Tathagata Das <tathagata.das1565@gmail.com> | 2012-12-26 19:19:07 -0800 |
---|---|---|
committer | Tathagata Das <tathagata.das1565@gmail.com> | 2012-12-26 19:19:07 -0800 |
commit | 7c33f76291eda2144fe16e48e261cb62cdadb7f6 (patch) | |
tree | 88a3aeeb2fc00060db678035595da5e5e4d5d68d /project | |
parent | 836042bb9f1eebabb7eeede3222fa389648c23da (diff) | |
parent | 84587a9bf3c734be151251b97ac5af48eb03f4d9 (diff) | |
download | spark-7c33f76291eda2144fe16e48e261cb62cdadb7f6.tar.gz spark-7c33f76291eda2144fe16e48e261cb62cdadb7f6.tar.bz2 spark-7c33f76291eda2144fe16e48e261cb62cdadb7f6.zip |
Merge branch 'mesos' into dev-merge
Diffstat (limited to 'project')
-rw-r--r-- | project/SparkBuild.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index b2e0aff407..a3f901a081 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -128,7 +128,7 @@ object SparkBuild extends Build { "org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION, "asm" % "asm-all" % "3.3.1", "com.google.protobuf" % "protobuf-java" % "2.4.1", - "de.javakaffee" % "kryo-serializers" % "0.9", + "de.javakaffee" % "kryo-serializers" % "0.20", "com.typesafe.akka" % "akka-actor" % "2.0.3", "com.typesafe.akka" % "akka-remote" % "2.0.3", "com.typesafe.akka" % "akka-slf4j" % "2.0.3", |