Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / tests / assets / default.conf

diff --git a/tests/assets/default.conf b/tests/assets/default.conf
index 75334426b77d01a7c64152a4f860bd85656600d0..1b23450474def3c08c68b97be6a875146da93f99 100644 (file)
--- a/tests/assets/default.conf
+++ b/tests/assets/default.conf
@@ -294,11 +294,11 @@ no-appendfsync-on-rewrite no
 ############################### ADVANCED CONFIG ###############################
 
 # Hashes are encoded in a special way (much more memory efficient) when they
 ############################### ADVANCED CONFIG ###############################
 
 # Hashes are encoded in a special way (much more memory efficient) when they

-# have at max a given numer of elements, and the biggest element does not
+# 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.
 # exceed a given threshold. You can configure this limits with the following
 # configuration directives.

-hash-max-zipmap-entries 64
-hash-max-zipmap-value 512
+hash-max-ziplist-entries 64
+hash-max-ziplist-value 512

 
 # 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
 
 # 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


@@ -317,7 +317,7 @@ set-max-intset-entries 512
 # order to help rehashing the main Redis hash table (the one mapping top-level
 # keys to values). The hash table implementation redis uses (see dict.c)
 # performs a lazy rehashing: the more operation you run into an hash table
 # order to help rehashing the main Redis hash table (the one mapping top-level
 # keys to values). The hash table implementation redis uses (see dict.c)
 # performs a lazy rehashing: the more operation you run into an hash table

-# that is rhashing, the more rehashing "steps" are performed, so if the
+# that is rehashing, the more rehashing "steps" are performed, so if the

 # server is idle the rehashing is never complete and some more memory is used
 # by the hash table.
 # 
 # server is idle the rehashing is never complete and some more memory is used
 # by the hash table.
 #