Merge upstreams

diff --git a/memcache.asd b/memcache.asd
index 260315985eaa34d41817153a599c919eac1f64b6..468f39461eaf77ecd0bb8f3601099b5684f05a43 100644 (file)
--- 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 50286a39d134c6b045918231ac6096dbe8e16c0b..858e26467e99dc0fa0b1583f850e83473a5b59a3 100644 (file)
--- 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 35d4571e66d6df874053742592ad95b7b3921d77..fa085d1201a7a09a39af56fbc9f2eb92a73ee34a 100644 (file)
--- 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 172ff6d435fbc56743fcc61bb50300db8cf03e03..ff0d80ee951d082be5bdae9b3ac0dcfcd6eb365c 100644 (file)
--- 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))