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;hp=84ef300d07331fca7c7e54a57d1cfddec2eeb295

Merge upstreams
---

diff --git a/memcache.asd b/memcache.asd
index 2603159..468f394 100644
--- a/memcache.asd
+++ b/memcache.asd
@@ -11,7 +11,7 @@
 (defsystem #:memcache
   :version "0.5.0"
   :author "Kevin Rosenberg <kevin@rosenberg.net>, quasi <quasi@cleartrip.com>"
-  :depends-on (usocket kmrcl)
+  :depends-on (usocket kmrcl cl-who)
   :components ((:module memcache
                 :serial t
                 :components
diff --git a/memcache/util.lisp b/memcache/util.lisp
index 50286a3..858e264 100644
--- a/memcache/util.lisp
+++ b/memcache/util.lisp
@@ -68,8 +68,6 @@
 		(:td (format stream "Current items stored in server")) (:td (format stream "~a" (memcache::mc-stats-curr-items stats))))
 	       (:tr
 		(:td (format stream "Current items total")) (:td (:b (format stream "~a" (memcache::mc-stats-curr-items-total stats)))))
-	       (:tr
-		(:td (format stream "Current bytes used by server to store items")) (:td (format stream "~a MB" (float (/ (memcache::mc-stats-bytes stats) 1048576)))))
 	       (:tr
 		(:td (format stream "Number of open connections")) (:td (format stream "~a" (memcache::mc-stats-curr-connections stats))))
 	       (:tr
diff --git a/memstore.asd b/memstore.asd
index 35d4571..fa085d1 100644
--- a/memstore.asd
+++ b/memstore.asd
@@ -16,7 +16,7 @@
   :author "Kevin M. Rosenberg <kevin@rosenberg.net>"
   :version "1.0"
   :licence "BSD"
-  :depends-on (memcache cl-store flexi-streams zlib salza2 chipz)
+  :depends-on (memcache cl-store flexi-streams salza2 chipz)
   :components ((:module src
                 :serial t
                 :components
diff --git a/src/compress.lisp b/src/compress.lisp
index 172ff6d..ff0d80e 100644
--- a/src/compress.lisp
+++ b/src/compress.lisp
@@ -14,7 +14,6 @@
 ;; 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))
 
@@ -26,6 +25,7 @@
 
 ;; 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))