aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTyson <thamilton@verticalscope.com>2013-01-09 15:12:23 -0500
committerTyson <thamilton@verticalscope.com>2013-01-09 15:12:23 -0500
commit549ee388a125ac7014ae3dadfb16c582e250c654 (patch)
tree99b9ee8011a9df424049ee9bbec60fca6275fcb7 /core
parentbf9d9946f97782c9212420123b4a042918d7df5e (diff)
downloadspark-549ee388a125ac7014ae3dadfb16c582e250c654.tar.gz
spark-549ee388a125ac7014ae3dadfb16c582e250c654.tar.bz2
spark-549ee388a125ac7014ae3dadfb16c582e250c654.zip
Removed io.spray spray-json dependency as it is not needed.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/deploy/JsonProtocol.scala4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/src/main/scala/spark/deploy/JsonProtocol.scala b/core/src/main/scala/spark/deploy/JsonProtocol.scala
index dc7da85f9c..f14f804b3a 100644
--- a/core/src/main/scala/spark/deploy/JsonProtocol.scala
+++ b/core/src/main/scala/spark/deploy/JsonProtocol.scala
@@ -1,14 +1,12 @@
package spark.deploy
import master.{JobInfo, WorkerInfo}
-import spray.json._
+import cc.spray.json._
/**
* spray-json helper class containing implicit conversion to json for marshalling responses
*/
private[spark] object JsonProtocol extends DefaultJsonProtocol {
- import cc.spray.json._
-
implicit object WorkerInfoJsonFormat extends RootJsonWriter[WorkerInfo] {
def write(obj: WorkerInfo) = JsObject(
"id" -> JsString(obj.id),