diff options
author | antirez <antirez@gmail.com> | 2017-06-14 18:29:53 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2017-06-14 18:29:53 +0200 |
commit | ab9d398835dca1187f190b28786cd9cc28e1fea1 (patch) | |
tree | 0bf2e8e6adbe686f9e5c1180994dd9b9551ed830 | |
parent | 4740424049173cf139b79a79df97878ab5f76f95 (diff) | |
parent | d3b32ca48d083c86ff0c20691cb790f80d5935c2 (diff) | |
download | redis-ab9d398835dca1187f190b28786cd9cc28e1fea1.tar.gz |
Merge branch 'unstable' of github.com:/antirez/redis into unstable
-rw-r--r-- | src/cluster.c | 1 | ||||
-rw-r--r-- | src/cluster.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/cluster.c b/src/cluster.c index d5ad85fe7..77ec2f1b1 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -37,7 +37,6 @@ #include <arpa/inet.h> #include <fcntl.h> #include <unistd.h> -#include <sys/socket.h> #include <sys/stat.h> #include <sys/file.h> #include <math.h> diff --git a/src/cluster.h b/src/cluster.h index 5e228c0f9..af85841c9 100644 --- a/src/cluster.h +++ b/src/cluster.h @@ -232,7 +232,7 @@ union clusterMsgData { typedef struct { char sig[4]; /* Siganture "RCmb" (Redis Cluster message bus). */ uint32_t totlen; /* Total length of this message */ - uint16_t ver; /* Protocol version, currently set to 0. */ + uint16_t ver; /* Protocol version, currently set to 1. */ uint16_t port; /* TCP base port number. */ uint16_t type; /* Message type */ uint16_t count; /* Only used for some kind of messages. */ |