Merge branch 'unstable' of github.com:antirez/redis into unstable

diff --combined src/cluster.c
index 70c34aab884632c134ba587bcae6449e18e8aa79,0a580fa75e3268d9979e3397790a973e57e3c5c8..4e3cf74658141494810abe69a4e5997561fd1a4d
--- 1/src/cluster.c
--- 2/src/cluster.c
+++ b/src/cluster.c
@@@ -943,7 -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
@@@ -1193,11 -1192,13 +1193,13 @@@ void clusterCommand(redisClient *c) 
              "cluster_slots_ok:%d\r\n"
              "cluster_slots_pfail:%d\r\n"
              "cluster_slots_fail:%d\r\n"
+             "cluster_known_nodes:%lu\r\n"
              , statestr[server.cluster.state],
              slots_assigned,
              slots_ok,
              slots_pfail,
-             slots_fail
+             slots_fail,
+             dictSize(server.cluster.nodes)
          );
          addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",
              (unsigned long)sdslen(info)));