Alexis Campailla
3895a7d148
Conflicts: src/anet.c src/aof.c src/bitops.c src/config.c src/db.c src/debug.c src/dict.c src/migrate.c src/object.c src/redis.c src/redis.h src/sentinel.c src/t_list.c src/t_set.c src/t_zset.c src/util.c tests/instances.tcl
5 lines
62 B
Plaintext
5 lines
62 B
Plaintext
port 6379
|
|
dbfilename master.rdb
|
|
maxheap 1GB
|
|
include base.conf
|