diff options
| author | antirez <antirez@gmail.com> | 2010-05-13 14:24:41 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2010-05-13 14:24:41 +0200 |
| commit | 9682a58fca1c53cecbf1b7a65bcf343f1f53c098 (patch) | |
| tree | 4420ca67f941f77c51c664dbd02e441c0ac16cef /redis.conf | |
| parent | 32a6651355cc75f19f40b7d7a4cbd419ea19f39f (diff) | |
| parent | 9376e434f08003678e8042855bc5c35d406b8db2 (diff) | |
| download | redis-9682a58fca1c53cecbf1b7a65bcf343f1f53c098.tar.gz | |
conflicts resolved
Diffstat (limited to 'redis.conf')
| -rw-r--r-- | redis.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/redis.conf b/redis.conf index f8e64dc76..c48a2fb82 100644 --- a/redis.conf +++ b/redis.conf @@ -163,13 +163,14 @@ dir ./ # Still if append only mode is enabled Redis will load the data from the # log file at startup ignoring the dump.rdb file. # -# The name of the append only file is "appendonly.aof" -# # IMPORTANT: Check the BGREWRITEAOF to check how to rewrite the append # log file in background when it gets too big. appendonly no +# The name of the append only file (default: "appendonly.aof") +# appendfilename appendonly.aof + # The fsync() call tells the Operating System to actually write data on disk # instead to wait for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. |