diff options
author | antirez <antirez@gmail.com> | 2015-04-27 12:05:32 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2015-04-27 12:05:32 +0200 |
commit | 1d6eb701d8cd4265ff657f1a27dee55c7293117b (patch) | |
tree | 1e84405b0ee43e69e7ce721c9cf622fa5498e201 | |
parent | 1a93501f8baebfb44bc2548b2026d47c3cc91d1f (diff) | |
parent | b100fee900d0091083233aa16a4e87d80066fb59 (diff) | |
download | redis-1d6eb701d8cd4265ff657f1a27dee55c7293117b.tar.gz |
Merge branch 'unstable' of github.com:/antirez/redis into unstable
-rw-r--r-- | redis.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/redis.conf b/redis.conf index 127912c31..0f164af14 100644 --- a/redis.conf +++ b/redis.conf @@ -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 |