Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
7c1cec25
Commit
7c1cec25
authored
Mar 20, 2012
by
antirez
Browse files
Redis cluster stuff removed from 2.6 redis.conf file.
parent
0380c13b
Changes
2
Hide whitespace changes
Inline
Side-by-side
redis.conf
View file @
7c1cec25
...
@@ -376,25 +376,6 @@ auto-aof-rewrite-min-size 64mb
...
@@ -376,25 +376,6 @@ auto-aof-rewrite-min-size 64mb
# Set it to 0 or a negative value for unlimited execution without warnings.
# Set it to 0 or a negative value for unlimited execution without warnings.
lua
-
time
-
limit
5000
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 ###################################
################################## SLOW LOG ###################################
# The Redis Slow Log is a system to log queries that exceeded a specified
# The Redis Slow Log is a system to log queries that exceeded a specified
...
...
utils/redis.conf.tpl
View file @
7c1cec25
...
@@ -376,25 +376,6 @@ auto-aof-rewrite-min-size 64mb
...
@@ -376,25 +376,6 @@ auto-aof-rewrite-min-size 64mb
# Set it to 0 or a negative value for unlimited execution without warnings.
# Set it to 0 or a negative value for unlimited execution without warnings.
lua-time-limit 5000
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 ###################################
################################## SLOW LOG ###################################
# The Redis Slow Log is a system to log queries that exceeded a specified
# The Redis Slow Log is a system to log queries that exceeded a specified
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment