Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
72f53260
Commit
72f53260
authored
Jan 25, 2016
by
antirez
Browse files
Fix merge issues with 3.2 backports.
parent
53c9c299
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
72f53260
...
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment