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

This commit is contained in:
antirez 2014-02-27 10:14:03 +01:00
commit addd4de9c1

View File

@ -148,7 +148,7 @@ typedef struct {
char nodename[REDIS_CLUSTER_NAMELEN];
uint32_t ping_sent;
uint32_t pong_received;
char ip[16]; /* IP address last time it was seen */
char ip[REDIS_IP_STR_LEN]; /* IP address last time it was seen */
uint16_t port; /* port last time it was seen */
uint16_t flags;
uint32_t notused; /* for 64 bit alignment */