diff options
author | Dmitriy Lyubimov <dlyubimov@apache.org> | 2013-08-01 00:21:26 -0700 |
---|---|---|
committer | Dmitriy Lyubimov <dlyubimov@apache.org> | 2013-08-01 00:21:26 -0700 |
commit | d29ee3689be8b8353d4f2440ac4e0237e98be056 (patch) | |
tree | 0dafaaff6a2c8059e93ff05065fe0a0598cf4aa3 | |
parent | cb6be5bd7eab8b3cf682a6d0347b87d216d43939 (diff) | |
download | spark-d29ee3689be8b8353d4f2440ac4e0237e98be056.tar.gz spark-d29ee3689be8b8353d4f2440ac4e0237e98be056.tar.bz2 spark-d29ee3689be8b8353d4f2440ac4e0237e98be056.zip |
Merge fixes merge commit hasn't picked
-rw-r--r-- | core/src/test/scala/spark/KryoSerializerSuite.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/test/scala/spark/KryoSerializerSuite.scala b/core/src/test/scala/spark/KryoSerializerSuite.scala index f03d1c822a..01390027c8 100644 --- a/core/src/test/scala/spark/KryoSerializerSuite.scala +++ b/core/src/test/scala/spark/KryoSerializerSuite.scala @@ -22,7 +22,8 @@ import scala.collection.mutable import org.scalatest.FunSuite import com.esotericsoftware.kryo._ -import spark.test._ +import KryoTest._ + class KryoSerializerSuite extends FunSuite with SharedSparkContext { test("basic types") { val ser = (new KryoSerializer).newInstance() |