summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-12 16:07:43 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-12 16:07:43 +0000
commitf4e1ec4f8a496b5d8148091ec720bca4e36fe67a (patch)
tree9060732361968199f46170670dc8e3587685e929
parent6eeff67c6e03233d4480a55d05d4e0f1a88aef4c (diff)
parentbfbf23d788901692a490622b6562b383f6f020b6 (diff)
downloadgitlab-ce-f4e1ec4f8a496b5d8148091ec720bca4e36fe67a.tar.gz
Merge branch 'patch-11' into 'master'
update redis server details See merge request !7436
-rw-r--r--doc/administration/high_availability/redis.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index bc424330656..8656b42f274 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -48,15 +48,15 @@ Redis.
redis['password'] = 'Redis Password'
```
-1. Run `sudo gitlab-ctl reconfigure` to install and configure PostgreSQL.
+1. Run `sudo touch /etc/gitlab/skip-auto-migrations` to prevent database migrations
+ from running on upgrade. Only the primary GitLab application server should
+ handle migrations.
+
+1. Run `sudo gitlab-ctl reconfigure` to install and configure Redis.
> **Note**: This `reconfigure` step will result in some errors.
That's OK - don't be alarmed.
-1. Run `touch /etc/gitlab/skip-auto-migrations` to prevent database migrations
- from running on upgrade. Only the primary GitLab application server should
- handle migrations.
-
## Experimental Redis Sentinel support
> [Introduced][ce-1877] in GitLab 8.11.