From aeecbdfae3e410959b396ab72d652673aea5c59a Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 31 Oct 2011 11:14:24 +0100 Subject: [PATCH] 1fe4cd5 --- src/redis.c | 4 ++-- src/redis.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redis.c b/src/redis.c index a7d8254b..832a9f59 100644 --- a/src/redis.c +++ b/src/redis.c @@ -869,8 +869,8 @@ void initServerConfig() { server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES; server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE; server.shutdown_asap = 0; - server.repl_ping_slave_period = REDIS_REPL_PING_SLAVE_PERIOD; - server.repl_timeout = REDIS_REPL_TIMEOUT; + server.repl_ping_slave_period = REDIS_REPL_PING_SLAVE_PERIOD; + server.repl_timeout = REDIS_REPL_TIMEOUT; server.cluster_enabled = 0; server.cluster.configfile = zstrdup("nodes.conf"); server.lua_time_limit = REDIS_LUA_TIME_LIMIT; diff --git a/src/redis.h b/src/redis.h index dda0f6c9..07680903 100644 --- a/src/redis.h +++ b/src/redis.h @@ -594,8 +594,8 @@ struct redisServer { char *masterauth; char *masterhost; int masterport; - int repl_ping_slave_period; - int repl_timeout; + int repl_ping_slave_period; + int repl_timeout; redisClient *master; /* client that is master for this slave */ int repl_syncio_timeout; /* timeout for synchronous I/O calls */ int replstate; /* replication status if the instance is a slave */ -- GitLab