Merge pull request #741 from Run/typo

[redis.git] / 00-RELEASENOTES

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 49221f2c04e7e1119549fee199a0f620897fe384..d91f0c29d3996e1d197ae8e491d63b69b9f751fa 100644 (file)
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -7,7 +7,7 @@ Redis 2.4 is mostly a strict subset of 2.6. However there are a few things
 that you should be aware of:
 
 * You can't use .rdb and AOF files generated with 2.6 into a 2.4 instance.
-* 2.4 slaves can be attached to 2.6 masters, but not the contrary, and only
+* 2.6 slaves can be attached to 2.4 masters, but not the contrary, and only
   for the time needed to perform the version upgrade.
 
 There are also a few API differences, that are unlikely to cause problems,
@@ -22,6 +22,12 @@ but it is better to keep them in mind:
   starting with '#'. All the major clients should be already fixed to work
   with the new INFO format.
 
+Also the following redis.conf and CONFIG GET / SET parameters changed name:
+
+    * hash-max-zipmap-entries, now replaced by hash-max-ziplist-entries
+    * hash-max-zipmap-value, now replaced by hash-max-ziplist-value
+    * glueoutputbuf was no completely removed as it does not make sense
+
 ---------
 CHANGELOG
 ---------