Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
eb561236ba
|
@ -147,7 +147,7 @@ supervised systemd
|
||||||
#
|
#
|
||||||
# Creating a pid file is best effort: if Redis is not able to create it
|
# Creating a pid file is best effort: if Redis is not able to create it
|
||||||
# nothing bad happens, the server will start and run normally.
|
# nothing bad happens, the server will start and run normally.
|
||||||
pidfile /var/run/redis/redis-server.pid
|
pidfile /var/run/redis/redis-slave-server.pid
|
||||||
|
|
||||||
# Specify the server verbosity level.
|
# Specify the server verbosity level.
|
||||||
# This can be one of:
|
# This can be one of:
|
||||||
|
|
Loading…
Reference in New Issue