merge fix

maropu · Jul 1, 2015 · 39732a1 · 39732a1
2 parents a6f7deb + 09ad698
commit 39732a1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/test/scala/org/apache/spark/deploy/rest/SubmitRestProtocolSuite.scala b/core/src/test/scala/org/apache/spark/deploy/rest/SubmitRestProtocolSuite.scala
@@ -19,9 +19,10 @@ package org.apache.spark.deploy.rest
 
 import java.lang.Boolean
 
+import org.json4s.jackson.JsonMethods._
+
 import org.apache.spark.{SparkConf, SparkFunSuite}
 import org.apache.spark.util.Utils
-import org.json4s.jackson.JsonMethods._
 
 /**
  * Tests for the REST application submission protocol.