From: antirez Date: Tue, 12 Apr 2011 13:36:10 +0000 (+0200) Subject: Merge branch 'unstable' of github.com:antirez/redis into unstable X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/d415f9ff41ed5b87de9baa7a9521431ed7d78d3c?hp=e9ee513b6a940ecd3e30a152d6ad2e8fb25147a5 Merge branch 'unstable' of github.com:antirez/redis into unstable --- diff --git a/src/cluster.c b/src/cluster.c index 0a580fa7..4e3cf746 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -943,6 +943,7 @@ void clusterCron(void) { node->flags &= ~REDIS_NODE_PFAIL; } else if (node->flags & REDIS_NODE_FAIL && !node->numslaves) { node->flags &= ~REDIS_NODE_FAIL; + clusterUpdateState(); } } else { /* Timeout reached. Set the noad se possibly failing if it is