]> git.saurik.com Git - redis.git/commitdiff
projects / redis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f194a9 f3a6143)
Merge remote-tracking branch 'origin/unstable' into unstable
authorantirez <antirez@gmail.com>
Sat, 28 Jul 2012 18:55:17 +0000 (20:55 +0200)
committerantirez <antirez@gmail.com>
Sat, 28 Jul 2012 18:55:17 +0000 (20:55 +0200)
1  2 
src/sentinel.c patch | diff1 | diff2 | blob | history

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