Fix wonky imports from merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/372a533a Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/372a533a Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/372a533a Branch: refs/heads/master Commit: 372a533a6c091361115f0f0712e93ef3af376b30 Parents: aa5002b Author: Andrew Or <andrewo...@gmail.com> Authored: Thu Jan 9 21:47:49 2014 -0800 Committer: Andrew Or <andrewo...@gmail.com> Committed: Thu Jan 9 21:47:49 2014 -0800 ---------------------------------------------------------------------- .../test/java/org/apache/spark/streaming/JavaAPISuite.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/372a533a/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java ---------------------------------------------------------------------- diff --git a/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java b/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java index be93799..8b7d770 100644 --- a/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java +++ b/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java @@ -17,14 +17,6 @@ package org.apache.spark.streaming; -import com.google.common.base.Optional; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import com.google.common.io.Files; - -import kafka.serializer.StringDecoder; - import scala.Tuple2; import org.junit.After; @@ -36,6 +28,7 @@ import java.util.*; import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.io.Files; +import com.google.common.collect.Sets; import org.apache.spark.SparkConf; import org.apache.spark.HashPartitioner;