From: antirez <antirez@gmail.com>
Date: Fri, 15 Jun 2012 11:44:17 +0000 (+0200)
Subject: Redis 2.5.11 (2.6 RC5).
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/0c9cf45270141d9f7bb1124a98fbe8c8d2e1d461

Redis 2.5.11 (2.6 RC5).
---

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 031a433e..5c76973d 100644
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -14,6 +14,19 @@ HIGH:     There is a critical bug that may affect some part of users. Upgrade!
 CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 --------------------------------------------------------------------------------
 
+---[ Redis 2.5.11 (2.6 Release Candidate 5) ]
+
+UPGRADE URGENCY: HIGH.
+
+* [BUGFIX]   Fixed Hash corruption when loading an RDB file generated by
+             previous versions of Redis that encoded hashes using
+             a different ziplist encoding format for small integers.
+             All the fileds that are integers in the range 0-255 may not
+             be recognized, or duplicated un updates, causing a crash
+             when the ziplist is converted to a real hash. (Issue #547).
+* [BUGFIX]   Fixed the count of memory used by output buffers in the
+             setDeferredMultiBulkLength() function.
+
 ---[ Redis 2.5.10 (2.6 Release Candidate 4) ]
 
 UPGRADE URGENCY: HIGH.
diff --git a/src/version.h b/src/version.h
index e2827f57..e98f7b40 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "2.5.10"
+#define REDIS_VERSION "2.5.11"