]> git.saurik.com Git - redis.git/commit
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)
commit9e83ac06ef1c978c65fefc1fbf5af1e95f31fe15
treeecdb79452a14e0a779e2d4ddb6cbfca827b07cf9
parent49128f0b9da725de992e427fa341a837bcc2991b
parent556bdfbab9062d472e19d882ae045fece36a25ab
Merge branch 'master' into networking-perf

Resolved conflict in src/db.c and changed adding an error to the reply
in blockingPopGenericCommand to use the new API.
src/db.c
src/redis.c
src/t_list.c