Merge branch 'unstable' into redis_6_merge

Former-commit-id: 40761e403166bf3342fe388ab742498f99245b1a
This commit is contained in:
John Sully 2020-03-17 00:09:48 -04:00
commit e800858c4c

View File

@ -921,8 +921,15 @@ void configGetCommand(client *c) {
listIter li;
listNode *ln;
listRewind(g_pserver->masters, &li);
bool fFirst = true;
while ((ln = listNext(&li)))
{
if (!fFirst)
{
addReplyBulkCString(c,optname);
matches++;
}
fFirst = false;
struct redisMaster *mi = (struct redisMaster*)listNodeValue(ln);
snprintf(buf,sizeof(buf),"%s %d",
mi->masterhost, mi->masterport);