]> git.saurik.com Git - redis.git/commitdiff
projects / redis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3fcd6b 3aa4b00)
Merge remote-tracking branch 'origin/unstable' into bg-aof-2
authorantirez <antirez@gmail.com>
Fri, 16 Sep 2011 10:36:33 +0000 (12:36 +0200)
committerantirez <antirez@gmail.com>
Fri, 16 Sep 2011 10:36:33 +0000 (12:36 +0200)
1  2 
src/aof.c patch | diff1 | diff2 | blob | history

diff --cc src/aof.c
Simple merge
Redis += OpenLDAP MDB