Commit 61bbab8a authored by Nick Thomas's avatar Nick Thomas

Merge branch 'simplify-geo-doc-wording' into 'master'

Simplify Geo doc wording

See merge request gitlab-org/gitlab-ee!5618
parents 729321ed 627e5b19
# Geo (Geo Replication) **[PREMIUM ONLY]** # Geo (Geo Replication) **[PREMIUM ONLY]**
> **Notes:** > **Notes:**
- Geo is part of [GitLab Premium][ee]. - Geo is part of [GitLab Premium][ee]
- Introduced in GitLab Enterprise Edition 8.9. - Introduced in GitLab Enterprise Edition 8.9
We recommend you use it with at least GitLab Enterprise Edition 10.0 for We recommend you use it with at least GitLab Enterprise Edition 10.0 for
basic Geo features, or latest version for a better experience. basic Geo features, or latest version for a better experience
- You should make sure that all nodes run the same GitLab version. - You should make sure that all nodes run the same GitLab version
- Geo requires PostgreSQL 9.6 and Git 2.9 in addition to GitLab's usual - Geo requires PostgreSQL 9.6 and Git 2.9 in addition to GitLab's usual
[minimum requirements][install-requirements] [minimum requirements][install-requirements]
- Using Geo in combination with High Availability is considered **GA** in GitLab Enterprise Edition 10.4 - Using Geo in combination with High Availability (HA) is considered **Generally Available** (GA) in GitLab Enterprise Edition 10.4
>**Note:** >**Note:**
Geo changes significantly from release to release. Upgrades **are** Geo changes significantly from release to release. Upgrades **are**
...@@ -213,11 +213,9 @@ extra limitations may be in place. ...@@ -213,11 +213,9 @@ extra limitations may be in place.
### Limitations on replication ### Limitations on replication
Only the following items are replicated to the secondary. Any data not on this Only the following items are replicated to the secondary. Data not on this list is unavailable on the secondary. Failing over without manually replicating it will cause the data to be **lost**:
list will not be available on the secondary, and failing over without manually
replicating it will cause the data to be **lost**:
- All database content (e.g., snippets, epics, issues, merge requests, groups, project metadata, etc) - All database content (e.g. snippets, epics, issues, merge requests, groups, project metadata, etc)
- Project repositories - Project repositories
- Project wiki repositories - Project wiki repositories
- User uploads (e.g. attachments to issues, merge requests and epics, avatars, etc) - User uploads (e.g. attachments to issues, merge requests and epics, avatars, etc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment