diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-02-02 00:25:54 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-02-02 00:25:54 -0800 |
| commit | ec28b607fd58489024ea7a6e801a97507036c1b2 (patch) | |
| tree | a891bbc8b806576ad7893279d38483a183a8691d /run | |
| parent | 7f74ee99f68911bcd471f8b428e5c2055d1f95b0 (diff) | |
| parent | 817e7223213b8d4ef8c783acca1345ef03e97f22 (diff) | |
| download | spark-ec28b607fd58489024ea7a6e801a97507036c1b2.tar.gz spark-ec28b607fd58489024ea7a6e801a97507036c1b2.tar.bz2 spark-ec28b607fd58489024ea7a6e801a97507036c1b2.zip | |
Merge branch 'master' into sbt
Conflicts:
Makefile
core/src/main/java/spark/compress/lzf/LZF.java
core/src/main/java/spark/compress/lzf/LZFInputStream.java
core/src/main/java/spark/compress/lzf/LZFOutputStream.java
core/src/main/native/spark_compress_lzf_LZF.c
run
Diffstat (limited to 'run')
| -rwxr-xr-x | run | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -51,6 +51,7 @@ CLASSPATH+=:$CORE_DIR/lib/jetty-7.1.6.v20100715/servlet-api-2.5.jar CLASSPATH+=:$CORE_DIR/lib/apache-log4j-1.2.16/log4j-1.2.16.jar CLASSPATH+=:$CORE_DIR/lib/slf4j-1.6.1/slf4j-api-1.6.1.jar CLASSPATH+=:$CORE_DIR/lib/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar +CLASSPATH+=:$CORE_DIR/lib/compress-lzf-0.6.0/compress-lzf-0.6.0.jar CLASSPATH+=:$EXAMPLES_DIR/target/scala_2.8.1/classes for jar in $CORE_DIR/lib/hadoop-0.20.0/lib/*.jar; do CLASSPATH+=:$jar |