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

huangboran123 · Apr 27, 2015 · 1d6eb70 · 1d6eb70
2 parents 1a93501 + b100fee
commit 1d6eb70
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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