diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-07-21 16:08:39 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-07-21 16:08:39 -0700 |
| commit | 2bfd7931e83b2b1017a2cad9206a568a0cee12a2 (patch) | |
| tree | df01cf1d52080089bab4aa97bf38060b85c30f10 /project | |
| parent | 02678724a42ee0fa4f83e29a8de3f4f38ca21cf2 (diff) | |
| parent | 4096c2287ec8e69b0c879ea0c512b9f7152e15ab (diff) | |
| download | spark-2bfd7931e83b2b1017a2cad9206a568a0cee12a2.tar.gz spark-2bfd7931e83b2b1017a2cad9206a568a0cee12a2.tar.bz2 spark-2bfd7931e83b2b1017a2cad9206a568a0cee12a2.zip | |
Merge branch 'new-rdds-protobuf'
Conflicts:
core/src/main/scala/spark/Executor.scala
core/src/main/scala/spark/RDD.scala
Diffstat (limited to 'project')
| -rw-r--r-- | project/build/SparkProject.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/project/build/SparkProject.scala b/project/build/SparkProject.scala index 58908731a3..4d5ab3be08 100644 --- a/project/build/SparkProject.scala +++ b/project/build/SparkProject.scala @@ -39,6 +39,7 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje val asm = "asm" % "asm-all" % "3.3.1" val scalaTest = "org.scalatest" % "scalatest" % "1.3" % "test" val scalaCheck = "org.scala-tools.testing" %% "scalacheck" % "1.7" % "test" + val protobuf = "com.google.protobuf" % "protobuf-java" % "2.3.0" } class ReplProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport |