From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sat, 29 Aug 2015 17:04:48 +0000 (-0600)
Subject: Merge upstreams
X-Git-Url: http://git.kpe.io/?p=memstore.git;a=commitdiff_plain;h=51026e8bede49e9dd304195fe4dee30df6326d27

Merge upstreams
---

51026e8bede49e9dd304195fe4dee30df6326d27
diff --cc src/compress.lisp
index 172ff6d,c3920f7..ff0d80e
--- a/src/compress.lisp
+++ b/src/compress.lisp
@@@ -14,10 -14,6 +14,9 @@@
  ;; KMR: zlib gives compression errors on random tests:
  ;;    indices outside of input array size
  ;; Using salza2 as default compressor
- 
 +(defun compress-zlib (data)
 +  (zlib:compress data :fixed))
 +
  (defun compress (data)
    (let ((comp (salza2:compress-data
                 data
@@@ -26,8 -22,8 +25,9 @@@
  
  ;; KMR: zlib appears to works fine with salza2 zlib compressor, but
  ;; moving to chipz as default decompressor as appears better supported
 -;;(defun uncompress-zlib (data)
 -;;  (zlib:uncompress data))
++
 +(defun uncompress-zlib (data)
 +  (zlib:uncompress data))
  
  (defun uncompress (data)
    (chipz:decompress nil 'chipz:zlib data))