diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2013-07-12 14:12:04 -0700 |
|---|---|---|
| committer | Salvatore Sanfilippo <antirez@gmail.com> | 2013-07-12 14:12:04 -0700 |
| commit | 34e20658307ae47bba4b4e14198534b361f4a642 (patch) | |
| tree | 6716bc53c229389e30ecce30a805d7271356b43f | |
| parent | 123b221dc94627f9776e880956b629a8144a04a2 (diff) | |
| parent | f39a0bdb7744314c0b999c996ae43be1768877c7 (diff) | |
| download | redis-34e20658307ae47bba4b4e14198534b361f4a642.tar.gz | |
Merge pull request #1193 from tnm/patch-1
Make sure the log standardizes on 'timeout'
| -rw-r--r-- | src/replication.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/replication.c b/src/replication.c index f82c32a8f..8b4c1b7c5 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1554,7 +1554,7 @@ void replicationCron(void) { if (server.masterhost && server.repl_state == REDIS_REPL_CONNECTED && (time(NULL)-server.master->lastinteraction) > server.repl_timeout) { - redisLog(REDIS_WARNING,"MASTER time out: no data nor PING received..."); + redisLog(REDIS_WARNING,"MASTER timeout: no data nor PING received..."); freeClient(server.master); } |