diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-10 19:06:07 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-10 19:06:07 -0800 |
| commit | 6d1c2302810f497433df6ab8faa6bd5f40aed27f (patch) | |
| tree | 08dceeeb51c305da14d783b9aff4f12b4468913f /project | |
| parent | aa1c8c602d971ddade8db262f0b34e3a7c1ffebf (diff) | |
| parent | 549ee388a125ac7014ae3dadfb16c582e250c654 (diff) | |
| download | spark-6d1c2302810f497433df6ab8faa6bd5f40aed27f.tar.gz spark-6d1c2302810f497433df6ab8faa6bd5f40aed27f.tar.bz2 spark-6d1c2302810f497433df6ab8faa6bd5f40aed27f.zip | |
Merge pull request #357 from tysonjh/master
JSON support added to WebUI
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 518c4130f0..219674028e 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -134,6 +134,7 @@ object SparkBuild extends Build { "colt" % "colt" % "1.2.0", "cc.spray" % "spray-can" % "1.0-M2.1", "cc.spray" % "spray-server" % "1.0-M2.1", + "cc.spray" %% "spray-json" % "1.1.1", "org.apache.mesos" % "mesos" % "0.9.0-incubating" ) ++ (if (HADOOP_MAJOR_VERSION == "2") Some("org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION) else None).toSeq, unmanagedSourceDirectories in Compile <+= baseDirectory{ _ / ("src/hadoop" + HADOOP_MAJOR_VERSION + "/scala") } |