mirror of
https://github.com/fluencelabs/redis
synced 2025-03-19 17:10:50 +00:00
Merge branch 'unstable' of github.com:/antirez/redis into unstable
This commit is contained in:
commit
73dd51c044
@ -837,7 +837,7 @@ void replconfCommand(client *c) {
|
|||||||
/* REPLCONF GETACK is used in order to request an ACK ASAP
|
/* REPLCONF GETACK is used in order to request an ACK ASAP
|
||||||
* to the slave. */
|
* to the slave. */
|
||||||
if (server.masterhost && server.master) replicationSendAck();
|
if (server.masterhost && server.master) replicationSendAck();
|
||||||
/* Note: this command does not reply anything! */
|
return;
|
||||||
} else {
|
} else {
|
||||||
addReplyErrorFormat(c,"Unrecognized REPLCONF option: %s",
|
addReplyErrorFormat(c,"Unrecognized REPLCONF option: %s",
|
||||||
(char*)c->argv[j]->ptr);
|
(char*)c->argv[j]->ptr);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user