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

This commit is contained in:
antirez 2015-04-27 12:05:32 +02:00
commit 1d6eb701d8

View File

@ -55,7 +55,7 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bind 127.0.0.1
# Accept connections on the specified port, default is 6379.
# Accept connections on the specified port, default is 6379 (IANA #815344).
# If port 0 is specified Redis will not listen on a TCP socket.
port 6379