Non blocking replication (finally!). C-side linked lists API improved.

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index c1b4297c92f975b81163c01aeafefe0bfd6d5777..0083d7f100e9bf0a703bbb8ef2de1dd2268603a8 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -62,6 +62,17 @@ databases 16
 
 # slaveof <masterip> <masterport>
 
 
 # slaveof <masterip> <masterport>
 

+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass foobared
+

 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a


@@ -74,12 +85,3 @@ glueoutputbuf yes
 # pool so it uses more CPU and can be a bit slower. Usually it's a good
 # idea.
 shareobjects no
 # pool so it uses more CPU and can be a bit slower. Usually it's a good
 # idea.
 shareobjects no

-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-
-#requirepass foobared