Redis 2.6.0

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 02a3db3a08fe1d28d3585a4d64b5dca49e390d1d..8a547821b959a253e4bbf034c9f8b0a171f1db80 100644 (file)
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -14,6 +14,15 @@ HIGH:     There is a critical bug that may affect a subset of users. Upgrade!
 CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 --------------------------------------------------------------------------------
 
 CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 --------------------------------------------------------------------------------
 

+---[ Redis 2.6.0 ]
+
+* [BUGFIX]   Allow AUTH when server is in -BUSY state because of a slow script.
+* [BUGFIX]   MULTI/EXEC flow now makes sense when observed in MONITOR
+* [BUGFIX]   SCRIPT KILL now uses different error prefixes for different errors.
+* [BUGFIX]   Default memory limit for 32bit archs lowered from 3.5 to 3 GB.
+* [BUGFIX]   redis-check-dump is now compatible with RDB files generated by 2.6.
+* [IMPROVED] New field in INFO: slave_read_only.
+

 ---[ Redis 2.5.14 (2.6 Release Candidate 8) ]
 
 * [BUGFIX]   Fixed compilation on FreeBSD.
 ---[ Redis 2.5.14 (2.6 Release Candidate 8) ]
 
 * [BUGFIX]   Fixed compilation on FreeBSD.

diff --git a/src/version.h b/src/version.h
index 9e21cb9692003837dac807e5b3433e3a690b9d15..7dca5314969c0e8009808bceb5ba8e39acdad6c4 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "2.5.14"
+#define REDIS_VERSION "2.6.0"