From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Fri, 3 Sep 2010 14:44:31 +0000 (+0200)
Subject: Merge branch 'master' into networking-perf
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/9e83ac06ef1c978c65fefc1fbf5af1e95f31fe15?hp=9e83ac06ef1c978c65fefc1fbf5af1e95f31fe15

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.
---