Merge conflicts resolved.

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 2b4b6479682bd1c73ffc699a1a4fec2d8f8316cc..80e14ad953dc15f5ae09777d37e016e3a604b6ef 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -421,12 +421,11 @@ slowlog-max-len 1024
 
 ############################### ADVANCED CONFIG ###############################
 
-# Hashes are encoded in a special way (much more memory efficient) when they
-# have at max a given number of elements, and the biggest element does not
-# exceed a given threshold. You can configure this limits with the following
-# configuration directives.
-hash-max-zipmap-entries 512
-hash-max-zipmap-value 64
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
 
 # Similarly to hashes, small lists are also encoded in a special way in order
 # to save a lot of space. The special representation is only used when