caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
antirez 2018-09-26 13:39:16 +02:00
commit bec4bfaa0b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redis.conf
View File

@ -477,7 +477,7 @@ replica-priority 100
# #
# Port: The port is communicated by the replica during the replication # Port: The port is communicated by the replica during the replication
# handshake, and is normally the port that the replica is using to # handshake, and is normally the port that the replica is using to
# list for connections. # listen for connections.
# #
# However when port forwarding or Network Address Translation (NAT) is # However when port forwarding or Network Address Translation (NAT) is
# used, the replica may be actually reachable via different IP and port # used, the replica may be actually reachable via different IP and port

2
src/t_stream.c
View File

@ -1641,7 +1641,7 @@ uint64_t streamDelConsumer(streamCG *cg, sds name) {
* ----------------------------------------------------------------------- */ * ----------------------------------------------------------------------- */
/* XGROUP CREATE <key> <groupname> <id or $> /* XGROUP CREATE <key> <groupname> <id or $>
* XGROUP SETID <key> <id or $> * XGROUP SETID <key> <groupname> <id or $>
* XGROUP DESTROY <key> <groupname> * XGROUP DESTROY <key> <groupname>
* XGROUP DELCONSUMER <key> <groupname> <consumername> */ * XGROUP DELCONSUMER <key> <groupname> <consumername> */
void xgroupCommand(client *c) { void xgroupCommand(client *c) {