Merge remote-tracking branch 'origin/unstable' into unstable

diff --git a/redis.conf b/redis.conf
index 6663a4ec89da056b87ab9a8466b2cd6f59e7a08e..df23414c20af883c77a0b4ff9b0e7068564d72ba 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -339,8 +339,12 @@ auto-aof-rewrite-min-size 64mb
 # 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.
+# When a long running script exceed the maxium execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write commands was
+# already issue by the script but the user don't want to wait for the natural
+# termination of the script.
 #
 # Set it to 0 or a negative value for unlimited execution without warnings.
 lua-time-limit 5000

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index dd91d2cbb08b9a2cbff1db5c0d1e4d86e8396d01..3f3879189fa7a3e2a85ca21545daf5d935e128da 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -29,6 +29,7 @@ set ::all_tests {
     integration/replication-2
     integration/replication-3
     integration/aof
+    integration/aof-race
     unit/pubsub
     unit/slowlog
     unit/scripting