Merge remote-tracking branch 'ce/8-12-stable' into 8-12-stable-ee

Conflicts: VERSION

Merge remote-tracking branch 'ce/8-12-stable' into 8-12-stable-ee
Conflicts: VERSION
66aa9f2b · Ruben Davila · 75c8fcbf · a7179126 · 66aa9f2b · 66aa9f2b
Commit 66aa9f2b authored Sep 29, 2016 by Ruben Davila
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

CHANGELOG CHANGELOG +4 -1

GITLAB_SHELL_VERSION GITLAB_SHELL_VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.
-v 8.12.3 (unreleased)
+v 8.12.4 (unreleased)
+v 8.12.3
+  - Update Gitlab Shell to support low IO priority for storage moves
 v 8.12.2
  - Fix Import/Export not recognising correctly the imported services.

--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-3.6.0
+3.6.1