diff options
| author | Reynold Xin <reynoldx@gmail.com> | 2013-07-30 16:04:18 -0700 |
|---|---|---|
| committer | Reynold Xin <reynoldx@gmail.com> | 2013-07-30 16:04:18 -0700 |
| commit | 368c58eac55931f62677cf8fc38168a1dc9dfcec (patch) | |
| tree | ec9ed40b524a14f964525ec9313bc445e8028a83 /project | |
| parent | e87de037d608231610352512b8f66d7232398374 (diff) | |
| parent | 94238aae57475030f6e88102a83c7809c5835494 (diff) | |
| download | spark-368c58eac55931f62677cf8fc38168a1dc9dfcec.tar.gz spark-368c58eac55931f62677cf8fc38168a1dc9dfcec.tar.bz2 spark-368c58eac55931f62677cf8fc38168a1dc9dfcec.zip | |
Merge branch 'lazy_file_open' of github.com:lyogavin/spark into compression
Conflicts:
project/SparkBuild.scala
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 9920e00a67..be3ef1f148 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -168,6 +168,7 @@ object SparkBuild extends Build { "org.slf4j" % "slf4j-log4j12" % slf4jVersion, "commons-daemon" % "commons-daemon" % "1.0.10", "com.ning" % "compress-lzf" % "0.8.4", + "org.xerial.snappy" % "snappy-java" % "1.0.5", "org.ow2.asm" % "asm" % "4.0", "com.google.protobuf" % "protobuf-java" % "2.4.1", "com.typesafe.akka" % "akka-actor" % "2.0.5" excludeAll(excludeNetty), |