unstable merge conflicts resolved

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 6d18e2f5839d33b97e10fe9efc6b453851971d96..098c28da9127c84a4b2be4abe6690fdc45c55e36 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -312,6 +312,13 @@ no-appendfsync-on-rewrite no
 auto-aof-rewrite-percentage 100
 auto-aof-rewrite-min-size 64mb
 
+################################ 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
+
 ############################### ADVANCED CONFIG ###############################
 
 # Hashes are encoded in a special way (much more memory efficient) when they