From: antirez Date: Mon, 16 Jan 2012 15:50:41 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/unstable' into unstable X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/f7ccc4830bfd9345452027020c12c100d01090ef?ds=inline;hp=-c Merge remote-tracking branch 'origin/unstable' into unstable --- f7ccc4830bfd9345452027020c12c100d01090ef diff --combined redis.conf index 1d2b5a5e,22ec82e7..ad0c96e9 --- a/redis.conf +++ b/redis.conf @@@ -1,6 -1,6 +1,6 @@@ # Redis configuration file example - # Note on units: when memory size is needed, it is possible to specifiy + # Note on units: when memory size is needed, it is possible to specify # it in the usual form of 1k 5GB 4M and so forth: # # 1k => 1000 bytes @@@ -82,12 -82,6 +82,12 @@@ databases 1 # after 60 sec if at least 10000 keys changed # # Note: you can disable saving at all commenting all the "save" lines. +# +# It is also possible to remove all the previously configured save +# points by adding a save directive with a single empty string argument +# like in the following example: +# +# save "" save 900 1 save 300 10 @@@ -173,7 -167,7 +173,7 @@@ slave-serve-stale-data ye # Command renaming. # - # It is possilbe to change the name of dangerous commands in a shared + # It is possible to change the name of dangerous commands in a shared # environment. For instance the CONFIG command may be renamed into something # of hard to guess so that it will be still available for internal-use # tools but not available for general clients. @@@ -182,7 -176,7 +182,7 @@@ # # rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52 # - # It is also possilbe to completely kill a command renaming it into + # It is also possible to completely kill a command renaming it into # an empty string: # # rename-command CONFIG "" @@@ -309,7 -303,7 +309,7 @@@ appendfsync everyse # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving the durability of Redis is - # the same as "appendfsync none", that in pratical terms means that it is + # the same as "appendfsync none", that in practical terms means that it is # possible to lost up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@@ -331,7 -325,7 +331,7 @@@ no-appendfsync-on-rewrite n # is useful to avoid rewriting the AOF file even if the percentage increase # is reached but it is still pretty small. # - # Specify a precentage of zero in order to disable the automatic AOF + # Specify a percentage of zero in order to disable the automatic AOF # rewrite feature. auto-aof-rewrite-percentage 100 @@@ -342,10 -336,10 +342,10 @@@ auto-aof-rewrite-min-size 64m # Max execution time of a Lua script in milliseconds. # # If the maximum execution time is reached Redis will log that a script is - # still in execution after the maxium allowed time and will start to + # still in execution after the maximum allowed time and will start to # reply to queries with an error. # - # When a long running script exceed the maxium execution time only the + # When a long running script exceed the maximum execution time only the # SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be # used to stop a script that did not yet called write commands. The second # is the only way to shut down the server in the case a write commands was @@@ -401,7 -395,7 +401,7 @@@ slowlog-max-len 102 ############################### 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. hash-max-zipmap-entries 512 @@@ -428,9 -422,9 +428,9 @@@ zset-max-ziplist-value 6 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in # 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) + # 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. # @@@ -449,7 -443,7 +449,7 @@@ activerehashing ye ################################## INCLUDES ################################### # Include one or more other config files here. This is useful if you - # have a standard template that goes to all redis server but also need + # have a standard template that goes to all Redis server but also need # to customize a few per-server settings. Include files can include # other files, so use this wisely. #