diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-21 19:43:08 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-21 19:43:08 +0000 |
| commit | e82c707e510e10352fbad9e21824e56c396ec4a5 (patch) | |
| tree | 165f68dd5d138f8d4bc1cb918cec376c6a97fdf4 | |
| parent | ff986c7040f594f19225274896fdbaa34bc8a713 (diff) | |
| parent | eb04e2e913180328b4ca944781ab040d52896cf3 (diff) | |
| download | gitlab-ce-e82c707e510e10352fbad9e21824e56c396ec4a5.tar.gz | |
Merge branch 'sentinel-psswd-docs' into 'master'
Use master_password for Sentinel
See merge request !10857
| -rw-r--r-- | doc/administration/high_availability/redis.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index b4e7bf21e35..4638a9c9782 100644 --- a/doc/administration/high_availability/redis.md +++ b/doc/administration/high_availability/redis.md @@ -492,7 +492,7 @@ which ideally should not have Redis or Sentinels on it for a HA setup. redis['master_name'] = 'gitlab-redis' ## The same password for Redis authentication you set up for the master node. - redis['password'] = 'redis-password-goes-here' + redis['master_password'] = 'redis-password-goes-here' ## A list of sentinels with `host` and `port` gitlab_rails['redis_sentinels'] = [ |