]> git.saurik.com Git - redis.git/commitdiff
Merge branch 'master' into networking-perf
authorPieter Noordhuis <pcnoordhuis@gmail.com>
Fri, 3 Sep 2010 14:44:31 +0000 (16:44 +0200)
committerPieter Noordhuis <pcnoordhuis@gmail.com>
Fri, 3 Sep 2010 14:44:50 +0000 (16:44 +0200)
Resolved conflict in src/db.c and changed adding an error to the reply
in blockingPopGenericCommand to use the new API.


No differences found