summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-04-13 21:36:22 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2017-04-13 21:36:22 +0000
commit29e0b635dcf7cae982857378e93917d29dc61506 (patch)
tree5a591bc45c26be4d8b040fbd7054812a2af816f1
parent25fe756bde8f4d245eee077e545cb370f102d9a4 (diff)
parent014936871aa65dd8974e59384390b22a0b49c8c7 (diff)
downloadgitlab-ce-29e0b635dcf7cae982857378e93917d29dc61506.tar.gz
Merge branch 'clear-instructions' into 'master'
Make instructions clearer See merge request !10685
-rw-r--r--doc/update/README.md13
1 files changed, 5 insertions, 8 deletions
diff --git a/doc/update/README.md b/doc/update/README.md
index 7921d03d611..d024a809f24 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -50,20 +50,17 @@ update them are in [a separate document][omnidocker].
## Upgrading without downtime
-Starting with GitLab 9.1.0 it's possible to upgrade to a newer version of GitLab
+Starting with GitLab 9.1.0 it's possible to upgrade to a newer major, minor, or patch version of GitLab
without having to take your GitLab instance offline. However, for this to work
there are the following requirements:
-1. You can only upgrade 1 release at a time. For example, if 9.1.15 is the last
- release of 9.1 then you can safely upgrade from that version to 9.2.0.
+1. You can only upgrade 1 minor release at a time. So from 9.1 to 9.2, not to 9.3.
+2. You have to be on the most recent patch release. For example, if 9.1.15 is the last
+ release of 9.1 then you can safely upgrade from that version to any 9.2.x version.
However, if you are running 9.1.14 you first need to upgrade to 9.1.15.
2. You have to use [post-deployment
migrations](../development/post_deployment_migrations.md).
-3. You are using PostgreSQL. If you are using MySQL you will still need downtime
- when upgrading.
-
-This applies to major, minor, and patch releases unless stated otherwise in a
-release post.
+3. You are using PostgreSQL. If you are using MySQL please look at the release post to see if downtime is required.
## Upgrading between editions