diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-08-01 10:42:07 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-08-01 10:42:07 -0700 |
| commit | 3e4d5e5f8b61429c4e683a37d4d17737d75ca509 (patch) | |
| tree | 50e9e3e6cbe5834d51a825907b159f8a24bd2e1c /pom.xml | |
| parent | ffc034e4fbb6d63825626f555b2089c0389d0075 (diff) | |
| parent | 58756b72f101d20b03e6e129ea2a8aef3e14c042 (diff) | |
| download | spark-3e4d5e5f8b61429c4e683a37d4d17737d75ca509.tar.gz spark-3e4d5e5f8b61429c4e683a37d4d17737d75ca509.tar.bz2 spark-3e4d5e5f8b61429c4e683a37d4d17737d75ca509.zip | |
Merge branch 'master' into master-json
Conflicts:
core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -58,6 +58,7 @@ <module>core</module> <module>bagel</module> <module>examples</module> + <module>mllib</module> <module>tools</module> <module>streaming</module> <module>repl</module> @@ -183,6 +184,11 @@ <version>0.8.4</version> </dependency> <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>1.0.5</version> + </dependency> + <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> <version>4.0</version> |