diff options
| author | Matt Stancliff <matt@genges.com> | 2014-07-31 14:51:05 -0400 |
|---|---|---|
| committer | Matt Stancliff <matt@genges.com> | 2014-09-29 06:49:07 -0400 |
| commit | 12d0195b3013aff008bb492cf59f31d823f024b0 (patch) | |
| tree | 08d5176b2c8c5c2e902bef0907f6c58563d2d264 /src/cluster.h | |
| parent | fc8f7ec7656487b8f7dea14d33dbdbb2c6b6f470 (diff) | |
| download | redis-12d0195b3013aff008bb492cf59f31d823f024b0.tar.gz | |
Clean up text throughout project
- Remove trailing newlines from redis.conf
- Fix comment misspelling
- Clarifies zipEncodeLength usage and a C API mention (#1243, #1242)
- Fix cluster typos (inspired by @papanikge #1507)
- Fix rewite -> rewrite in a few places (inspired by #682)
Closes #1243, #1242, #1507
Diffstat (limited to 'src/cluster.h')
| -rw-r--r-- | src/cluster.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cluster.h b/src/cluster.h index adad0645f..3287afe72 100644 --- a/src/cluster.h +++ b/src/cluster.h @@ -11,7 +11,7 @@ #define REDIS_CLUSTER_NAMELEN 40 /* sha1 hex length */ #define REDIS_CLUSTER_PORT_INCR 10000 /* Cluster port = baseport + PORT_INCR */ -/* The following defines are amunt of time, sometimes expressed as +/* The following defines are amount of time, sometimes expressed as * multiplicators of the node timeout value (when ending with MULT). */ #define REDIS_CLUSTER_DEFAULT_NODE_TIMEOUT 15000 #define REDIS_CLUSTER_DEFAULT_SLAVE_VALIDITY 10 /* Slave max data age factor. */ @@ -51,7 +51,7 @@ typedef struct clusterLink { #define REDIS_NODE_HANDSHAKE 32 /* We have still to exchange the first ping */ #define REDIS_NODE_NOADDR 64 /* We don't know the address of this node */ #define REDIS_NODE_MEET 128 /* Send a MEET message to this node */ -#define REDIS_NODE_PROMOTED 256 /* Master was a slave propoted by failover */ +#define REDIS_NODE_PROMOTED 256 /* Master was a slave promoted by failover */ #define REDIS_NODE_NULL_NAME "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" #define nodeIsMaster(n) ((n)->flags & REDIS_NODE_MASTER) @@ -117,7 +117,7 @@ typedef struct clusterState { or zero if stil not received. */ int mf_can_start; /* If non-zero signal that the manual failover can start requesting masters vote. */ - /* The followign fields are uesd by masters to take state on elections. */ + /* The followign fields are used by masters to take state on elections. */ uint64_t lastVoteEpoch; /* Epoch of the last vote granted. */ int todo_before_sleep; /* Things to do in clusterBeforeSleep(). */ long long stats_bus_messages_sent; /* Num of msg sent via cluster bus. */ |