sds.c single quotes support

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 9e9eac5f8f97808833d74ab7698bd5f90f77b18d..71d6f70b00ef2069c28af1a6844e064644534714 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -34,6 +34,7 @@ port 6379
 # on a unix socket when not specified.
 #
 # unixsocket /tmp/redis.sock
 # on a unix socket when not specified.
 #
 # unixsocket /tmp/redis.sock

+# unixsocketperm 755

 
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300


@@ -315,9 +316,35 @@ auto-aof-rewrite-min-size 64mb
 ################################ LUA SCRIPTING  ###############################
 
 # Max execution time of a Lua script in milliseconds.
 ################################ LUA SCRIPTING  ###############################
 
 # Max execution time of a Lua script in milliseconds.

-# This prevents that a programming error generating an infinite loop will block
-# your server forever. Set it to 0 or a negative value for unlimited execution.
-lua-time-limit 60000
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maxium allowed time and will start to
+# reply to queries with an error.
+#
+# The SHUTDOWN command will be available to shutdown the server without
+# violating the database consistency if the script entered an infinite loop.
+#
+# 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 ###################################
 
 
 ################################## SLOW LOG ###################################