summaryrefslogtreecommitdiff
path: root/redis.conf
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2012-03-20 13:07:26 +0100
committerantirez <antirez@gmail.com>2012-03-20 13:07:26 +0100
commit7c1cec25251eabb2e3e1259e2111fddb46ceb675 (patch)
treed4e522edcd4f400dd7a131acae99f9950aec6344 /redis.conf
parent0380c13bbe140b627f1e1c713f1d9ca032c44c0c (diff)
downloadredis-7c1cec25251eabb2e3e1259e2111fddb46ceb675.tar.gz
Redis cluster stuff removed from 2.6 redis.conf file.
Diffstat (limited to 'redis.conf')
-rw-r--r--redis.conf19
1 files changed, 0 insertions, 19 deletions
diff --git a/redis.conf b/redis.conf
index e03359963..1c375305d 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