Merge branch '2.2' of github.com:antirez/redis into 2.2

redis · May 25, 2011 · 10e987c · 10e987c
2 parents cc958cc + ec27920
commit 10e987c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/00-RELEASENOTES b/00-RELEASENOTES
@@ -12,6 +12,19 @@ for 2.0.
 CHANGELOG
 ---------
 
+What's new in Redis 2.2.8
+=========================
+
+* A new form of dict.c (hash table implementation) iterator that performs less
+  copy-on-write of pages, introduced in Redis 2.2.7, caused ZINTERSTORE,
+  ZUNIONSTORE, SINTER, SINTERSTORE commands to behave in the wrong way.
+  This bug is now fixed.
+* Print version info before running the test with 'make test'. This is mainly
+  useful for the Continuous Integration system we run.
+* Fix for DEBUG DIGEST, key may expire on lookup, producing the wrong result.
+* Replication with expire test modified to produce no or less false failures.
+* Fixed Z*STORE when dealing with intsets, regression test added.
+
 What's new in Redis 2.2.7
 =========================
 

diff --git a/src/version.h b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "2.2.7"
+#define REDIS_VERSION "2.2.8"