]> git.saurik.com Git - redis.git/commitdiff
Merge pull request #576 from saj/fix-slave-ping-period
authorSalvatore Sanfilippo <antirez@gmail.com>
Wed, 5 Sep 2012 13:59:37 +0000 (06:59 -0700)
committerSalvatore Sanfilippo <antirez@gmail.com>
Wed, 5 Sep 2012 13:59:37 +0000 (06:59 -0700)
Bug fix: slaves being pinged every second

1  2 
src/redis.h
src/replication.c

diff --cc src/redis.h
Simple merge
Simple merge