diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2018-09-11 11:34:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 11:34:59 +0200 |
| commit | 890bd08a21323512a0f7201b0f17e37fa40a7725 (patch) | |
| tree | 6dab1ceea93c7e0b620fd56ac76a7747b7c55c75 | |
| parent | 76beb55c8177c562f7ed9bd82f065e7f08043bff (diff) | |
| parent | 5eeea42db3c1cc959d47d3a8150965751be132d2 (diff) | |
| download | redis-master-replica.tar.gz | |
Merge pull request #5339 from vrana/master-replicamaster-replica
Slave removal: capitalize Replica
| -rw-r--r-- | redis.conf | 8 | ||||
| -rw-r--r-- | sentinel.conf | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/redis.conf b/redis.conf index 3ca9fe5bc..0f1214fc5 100644 --- a/redis.conf +++ b/redis.conf @@ -366,7 +366,7 @@ repl-diskless-sync no # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 -# replicas send PINGs to server in a predefined interval. It's possible to change +# Replicas send PINGs to server in a predefined interval. It's possible to change # this interval with the repl_ping_replica_period option. The default value is 10 # seconds. # @@ -376,7 +376,7 @@ repl-diskless-sync-delay 5 # # 1) Bulk transfer I/O during SYNC, from the point of view of replica. # 2) Master timeout from the point of view of replicas (data, pings). -# 3) replica timeout from the point of view of masters (REPLCONF ACK pings). +# 3) Replica timeout from the point of view of masters (REPLCONF ACK pings). # # It is important to make sure that this value is greater than the value # specified for repl-ping-replica-period otherwise a timeout will be detected @@ -860,7 +860,7 @@ lua-time-limit 5000 # 1) If there are multiple replicas able to failover, they exchange messages # in order to try to give an advantage to the replica with the best # replication offset (more data from the master processed). -# replicas will try to get their rank by offset, and apply to the start +# Replicas will try to get their rank by offset, and apply to the start # of the failover a delay proportional to their rank. # # 2) Every single replica computes the time of the last interaction with @@ -901,7 +901,7 @@ lua-time-limit 5000 # to resist to failures as otherwise an orphaned master can't be failed over # in case of failure if it has no working replicas. # -# replicas migrate to orphaned masters only if there are still at least a +# Replicas migrate to orphaned masters only if there are still at least a # given number of other working replicas for their old master. This number # is the "migration barrier". A migration barrier of 1 means that a replica # will migrate only if there is at least 1 other working replica for its master diff --git a/sentinel.conf b/sentinel.conf index 42c8f8a3e..e428ad933 100644 --- a/sentinel.conf +++ b/sentinel.conf @@ -73,7 +73,7 @@ dir /tmp # be elected by the majority of the known Sentinels in order to # start a failover, so no failover can be performed in minority. # -# replicas are auto-discovered, so you don't need to specify replicas in +# Replicas are auto-discovered, so you don't need to specify replicas in # any way. Sentinel itself will rewrite this configuration file adding # the replicas using additional configuration options. # Also note that the configuration file is rewritten when a |