maxmemory implemented

1 files changed, 12 insertions, 0 deletions

diff --git a/redis.conf b/redis.conf
index 09f926d7b..e7b5b9d07 100644
--- a/redis.conf
+++ b/redis.conf
@@ -88,6 +88,18 @@ databases 16
 
 # maxclients 128
 
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys with an
+# EXPIRE set. It will try to start freeing keys that are going to expire
+# in little time and preserve keys with a longer time to live.
+# Redis will also try to remove objects from free lists if possible.
+#
+# If all this fails, Redis will start to reply with errors to commands
+# that will use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to most read-only commands like GET.
+
+# maxmemory <bytes>
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a