summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-07-27 16:01:44 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-07-27 16:01:44 +0000
commitaafa3f9fe09fcd8468a8f4274492f63ebead941a (patch)
tree48a7afae203eb606bd3fc4f65edb145502ed80be
parent98619a49c8e239a9e7c39451d72de4855a3eef9e (diff)
parent1843eeff0c67e3b5dd3c446de8f67eae59f0a0b4 (diff)
downloadgitlab-ce-aafa3f9fe09fcd8468a8f4274492f63ebead941a.tar.gz
Merge branch 'harish-update-backup-restore-docs' into 'master'
Document that instance types must match when restoring a backup See merge request !12639
-rw-r--r--doc/raketasks/backup_restore.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 6ccd79641bc..10f5ab3370d 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -5,9 +5,9 @@
An application data backup creates an archive file that contains the database,
all repositories and all attachments.
-You can only restore a backup to **exactly the same version** of GitLab on which
-it was created. The best way to migrate your repositories from one server to
-another is through backup restore.
+You can only restore a backup to **exactly the same version and type (CE/EE)**
+of GitLab on which it was created. The best way to migrate your repositories
+from one server to another is through backup restore.
## Backup
@@ -378,8 +378,8 @@ The [restore prerequisites section](#restore-prerequisites) includes crucial
information. Make sure to read and test the whole restore process at least once
before attempting to perform it in a production environment.
-You can only restore a backup to **exactly the same version** of GitLab that
-you created it on, for example 9.1.0.
+You can only restore a backup to **exactly the same version and type (CE/EE)** of
+GitLab that you created it on, for example CE 9.1.0.
### Restore prerequisites
@@ -450,8 +450,8 @@ Deleting tmp directories...[DONE]
This procedure assumes that:
-- You have installed the **exact same version** of GitLab Omnibus with which the
- backup was created.
+- You have installed the **exact same version and type (CE/EE)** of GitLab
+ Omnibus with which the backup was created.
- You have run `sudo gitlab-ctl reconfigure` at least once.
- GitLab is running. If not, start it using `sudo gitlab-ctl start`.