From 7c1cec25251eabb2e3e1259e2111fddb46ceb675 Mon Sep 17 00:00:00 2001 From: antirez Date: Tue, 20 Mar 2012 13:07:26 +0100 Subject: [PATCH] Redis cluster stuff removed from 2.6 redis.conf file. --- redis.conf | 19 ------------------- utils/redis.conf.tpl | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/redis.conf b/redis.conf index e0335996..1c375305 100644 --- a/redis.conf +++ b/redis.conf @@ -376,25 +376,6 @@ auto-aof-rewrite-min-size 64mb # Set it to 0 or a negative value for unlimited execution without warnings. lua-time-limit 5000 -################################ REDIS CLUSTER ############################### -# -# Normal Redis instances can't be part of a Redis Cluster, only nodes that are -# started as cluster nodes can. In order to start a Redis instance as a -# cluster node enable the cluster support uncommenting the following: -# -# cluster-enabled yes - -# Every cluster node has a cluster configuration file. This file is not -# intended to be edited by hand. It is created and updated by Redis nodes. -# Every Redis Cluster node requires a different cluster configuration file. -# Make sure that instances running in the same system does not have -# overlapping cluster configuration file names. -# -# cluster-config-file nodes-6379.conf - -# In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. - ################################## SLOW LOG ################################### # The Redis Slow Log is a system to log queries that exceeded a specified diff --git a/utils/redis.conf.tpl b/utils/redis.conf.tpl index e7febeda..33d99a50 100644 --- a/utils/redis.conf.tpl +++ b/utils/redis.conf.tpl @@ -376,25 +376,6 @@ auto-aof-rewrite-min-size 64mb # Set it to 0 or a negative value for unlimited execution without warnings. lua-time-limit 5000 -################################ REDIS CLUSTER ############################### -# -# Normal Redis instances can't be part of a Redis Cluster, only nodes that are -# started as cluster nodes can. In order to start a Redis instance as a -# cluster node enable the cluster support uncommenting the following: -# -# cluster-enabled yes - -# Every cluster node has a cluster configuration file. This file is not -# intended to be edited by hand. It is created and updated by Redis nodes. -# Every Redis Cluster node requires a different cluster configuration file. -# Make sure that instances running in the same system does not have -# overlapping cluster configuration file names. -# -# cluster-config-file nodes-6379.conf - -# In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. - ################################## SLOW LOG ################################### # The Redis Slow Log is a system to log queries that exceeded a specified -- GitLab