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

This commit is contained in:
antirez 2016-11-18 13:10:57 +01:00
commit 73dd51c044

View File

@ -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);