unstable merge conflicts resolved

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 6999dae3476cff578f8bed2004575ecfe73d037d..098c28da9127c84a4b2be4abe6690fdc45c55e36 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -319,32 +319,6 @@ auto-aof-rewrite-min-size 64mb
 # your server forever. Set it to 0 or a negative value for unlimited execution.
 lua-time-limit 60000
 
-#################################### DISK STORE ###############################
-
-# When disk store is active Redis works as an on-disk database, where memory
-# is only used as a object cache.
-#
-# This mode is good for datasets that are bigger than memory, and in general
-# when you want to trade speed for:
-#
-#  - less memory used
-#  - immediate server restart
-#  - per key durability, without need for backgrond savig
-#
-# On the other hand, with disk store enabled MULTI/EXEC are no longer
-# transactional from the point of view of the persistence on disk, that is,
-# Redis transactions will still guarantee that commands are either processed
-# all or nothing, but there is no guarantee that all the keys are flushed
-# on disk in an atomic way.
-#
-# Of course with disk store enabled Redis is not as fast as it is when
-# working with just the memory back end.
-
-diskstore-enabled no
-diskstore-path redis.ds
-cache-max-memory 0
-cache-flush-delay 0
-
 ############################### ADVANCED CONFIG ###############################
 
 # Hashes are encoded in a special way (much more memory efficient) when they