summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-11-02 11:07:02 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-11-02 11:07:02 +0000
commitee6d087ef2a7bbfede43741e04e850b363c74cb3 (patch)
tree67b3cb1abb908bedc7e772e2e2d4a0d25cdfe501 /CHANGELOG.md
parent1c491e54192ca4e8298be6abc00ba3374da52e5d (diff)
parente3f5d8fc4c2326bce38325d2c076f939e5f4ae50 (diff)
downloadgitlab-ce-ee6d087ef2a7bbfede43741e04e850b363c74cb3.tar.gz
Merge branch 'slony-upgrade-guide' into 'master'
Added guide for upgrading Postgres using Slony ## What does this MR do? This adds a guide for upgrading PostgreSQL using Slony. ## Are there points in the code the reviewer needs to double check? Spelling, grammar, etc ## Why was this MR needed? This process is not documented and we'll need to provide steps on how to do this before we start shipping PostgreSQL 9.6 with omnibus-gitlab. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @pcarranza @marin @axil See merge request !6711
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 116aa12dc71..bc90b1eb539 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Add hover to trash icon in notes !7008 (blackst0ne)
- Hides project activity tabs when features are disabled
- Only show one error message for an invalid email !5905 (lycoperdon)
+- Added guide describing how to upgrade PostgreSQL using Slony
- Fix sidekiq stats in admin area (blackst0ne)
- Added label description as tooltip to issue board list title
- Created cycle analytics bundle JavaScript file