Merge remote-tracking branch 'antirez/2.6' into rdio-2.6

00-RELEASENOTES

@@ -32,6 +32,15 @@ Also the following redis.conf and CONFIG GET / SET parameters changed name:
 CHANGELOG
 ---------
 
+What's new in Redis 2.5.8 (aka 2.6 Release Candidate 2)
+=======================================================
+
+UPGRADE URGENCY: high for all the users of the KEYS command, otherwise low.
+
+* [BUGFIX] Fix for KEYS command: if the DB contains keys with expires the KEYS
+           command may return the wrong output, having duplicated or missing
+           keys. See issue #487 and #488 on github for details.
+
 What's new in Redis 2.5.7 (aka 2.6 Release Candidate 1)
 =======================================================
 

src/version.h

@@ -1 +1 @@
-#define REDIS_VERSION "2.5.7"
+#define REDIS_VERSION "2.5.8"

tests/unit/aofrw.tcl

@@ -7,8 +7,12 @@ start_server {tags {"aofrw"}} {
         r bgrewriteaof
         r config set appendonly no
         r exec
-        set result [exec tail -n1 < [srv 0 stdout] ]
-    } {*Killing*AOF*child*}
+        wait_for_condition 50 100 {
+            [string match {*Killing*AOF*child*} [exec tail -n5 < [srv 0 stdout]]]
+        } else {
+            fail "Can't find 'Killing AOF child' into recent logs"
+        }
+    }
 
     foreach d {string int} {
         foreach e {ziplist linkedlist} {