fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-05-02 14:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge issues with 3.2 backports.

Browse Source
This commit is contained in:
antirez 2016-01-25 15:57:52 +01:00
parent 53c9c299df
commit 72f5326076
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster.c
View File

@ -4027,7 +4027,7 @@ void clusterCommand(redisClient *c) {
/* CLUSTER BUMPEPOCH */ /* CLUSTER BUMPEPOCH */
int retval = clusterBumpConfigEpochWithoutConsensus(); int retval = clusterBumpConfigEpochWithoutConsensus();
sds reply = sdscatprintf(sdsempty(),"+%s %llu\r\n", sds reply = sdscatprintf(sdsempty(),"+%s %llu\r\n",
(retval == C_OK) ? "BUMPED" : "STILL", (retval == REDIS_OK) ? "BUMPED" : "STILL",
(unsigned long long) myself->configEpoch); (unsigned long long) myself->configEpoch);
addReplySds(c,reply); addReplySds(c,reply);
} else if (!strcasecmp(c->argv[1]->ptr,"info") && c->argc == 2) { } else if (!strcasecmp(c->argv[1]->ptr,"info") && c->argc == 2) {
@ -4645,7 +4645,7 @@ void migrateCommand(redisClient *c) {
} }
/* Sanity check */ /* Sanity check */
if (getLongFromObjectOrReply(c,c->argv[5],&timeout,NULL) != REDIS__OK || if (getLongFromObjectOrReply(c,c->argv[5],&timeout,NULL) != REDIS_OK ||
getLongFromObjectOrReply(c,c->argv[4],&dbid,NULL) != REDIS_OK) getLongFromObjectOrReply(c,c->argv[4],&dbid,NULL) != REDIS_OK)
{ {
return; return;