Merge branch 'unstable' of github.com:/antirez/redis into unstable

This commit is contained in:
antirez 2016-06-10 09:02:13 +02:00
commit 67fcd26cf3

View File

@ -154,7 +154,7 @@ supervised no
# #
# 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.pid pidfile /var/run/redis_6379.pid
# Specify the server verbosity level. # Specify the server verbosity level.
# This can be one of: # This can be one of: