diff options
| author | antirez <antirez@gmail.com> | 2016-01-25 15:57:52 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2016-01-25 15:57:52 +0100 |
| commit | 72f53260767922abf80c84dae4cce5a8efc22c60 (patch) | |
| tree | 9bf0072ddf5f64295d3fb17c7a4941b994de8db5 | |
| parent | 53c9c299dfe9b7dbb18d44180a4ce4b7fc08320d (diff) | |
| download | redis-3.0.7.tar.gz | |
Fix merge issues with 3.2 backports.3.0.7
| -rw-r--r-- | src/cluster.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cluster.c b/src/cluster.c index 98d682bb9..5917db890 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -4027,7 +4027,7 @@ void clusterCommand(redisClient *c) { /* CLUSTER BUMPEPOCH */ int retval = clusterBumpConfigEpochWithoutConsensus(); sds reply = sdscatprintf(sdsempty(),"+%s %llu\r\n", - (retval == C_OK) ? "BUMPED" : "STILL", + (retval == REDIS_OK) ? "BUMPED" : "STILL", (unsigned long long) myself->configEpoch); addReplySds(c,reply); } else if (!strcasecmp(c->argv[1]->ptr,"info") && c->argc == 2) { @@ -4645,7 +4645,7 @@ void migrateCommand(redisClient *c) { } /* 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) { return; |