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 /core/lib/compress-lzf-0.6.0/LICENSE | |
| 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 'core/lib/compress-lzf-0.6.0/LICENSE')
| -rw-r--r-- | core/lib/compress-lzf-0.6.0/LICENSE | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/lib/compress-lzf-0.6.0/LICENSE b/core/lib/compress-lzf-0.6.0/LICENSE new file mode 100644 index 0000000000..c5da4e1348 --- /dev/null +++ b/core/lib/compress-lzf-0.6.0/LICENSE @@ -0,0 +1,11 @@ +Copyright 2009-2010 Ning, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS,WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations under +the License. |