diff options
| author | Marcia Ramos <marcia@gitlab.com> | 2019-09-09 14:21:28 +0000 |
|---|---|---|
| committer | Marcia Ramos <marcia@gitlab.com> | 2019-09-09 14:21:28 +0000 |
| commit | d2312b8b3fc20fcfa71dda8e7cfbf8f99040fe27 (patch) | |
| tree | c0e26a5fe3f6d60763639d77121ea4045b7e061e | |
| parent | 9fd44513d781964d82573072e520faf387f12d7a (diff) | |
| parent | 5dd2347b60a43bf8d8ffc17482aa5c4be930ac1a (diff) | |
| download | gitlab-ce-d2312b8b3fc20fcfa71dda8e7cfbf8f99040fe27.tar.gz | |
Merge branch 'docs/edit-db-load-balance' into 'master'
Fix capitalization of GitLab
Closes #67023
See merge request gitlab-org/gitlab-ce!32800
| -rw-r--r-- | doc/administration/database_load_balancing.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/database_load_balancing.md b/doc/administration/database_load_balancing.md index f643d853d10..6620989983f 100644 --- a/doc/administration/database_load_balancing.md +++ b/doc/administration/database_load_balancing.md @@ -148,9 +148,9 @@ The following options can be set: If `record_type` is set to `SRV`, GitLab will continue to use a round-robin algorithm and will ignore the `weight` and `priority` in the record. Since SRV records usually return hostnames instead of IPs, GitLab will look for the IPs of returned hostnames -in the additional section of the SRV response. If no IP is found for a hostname, Gitlab -will query the configured `nameserver` for ANY record for each such hostname looking for A or AAAA records, eventually -dropping this hostname from rotation if it can't resolve its IP. +in the additional section of the SRV response. If no IP is found for a hostname, GitLab +will query the configured `nameserver` for ANY record for each such hostname looking for A or AAAA +records, eventually dropping this hostname from rotation if it can't resolve its IP. The `interval` value specifies the _minimum_ time between checks. If the A record has a TTL greater than this value, then service discovery will honor said |