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

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 592171204fdb127ccb83969dee653d1456026e11..29e326d121ffbf5275224c362099634221dd0a9c 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -45,7 +45,7 @@ timeout 0
 # verbose (many rarely useful info, but not a mess like the debug level)
 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)
 # verbose (many rarely useful info, but not a mess like the debug level)
 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)

-loglevel verbose
+loglevel notice

 
 # Specify the log file name. Also 'stdout' can be used to force
 # Redis to log on the standard output. Note that if you use standard
 
 # Specify the log file name. Also 'stdout' can be used to force
 # Redis to log on the standard output. Note that if you use standard


@@ -279,7 +279,7 @@ appendonly no
 #
 # The default is "everysec" that's usually the right compromise between
 # speed and data safety. It's up to you to understand if you can relax this to
 #
 # The default is "everysec" that's usually the right compromise between
 # speed and data safety. It's up to you to understand if you can relax this to

-# "no" that will will let the operating system flush the output buffer when
+# "no" that will let the operating system flush the output buffer when

 # it wants, for better performances (but if you can live with the idea of
 # some data loss consider the default persistence mode that's snapshotting),
 # or on the contrary, use "always" that's very slow but a bit safer than
 # it wants, for better performances (but if you can live with the idea of
 # some data loss consider the default persistence mode that's snapshotting),
 # or on the contrary, use "always" that's very slow but a bit safer than