Merge branch 'changelog-4.2.1' into 'master'

Changelog for 4.2.1 See merge request gitlab-org/gitlab-workhorse!260

Merge branch 'changelog-4.2.1' into 'master'
Changelog for 4.2.1 See merge request gitlab-org/gitlab-workhorse!260
bd62278b · Nick Thomas · 92ec6d7b · 6ad88af7 · bd62278b · bd62278b
Commit bd62278b authored May 22, 2018 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CHANGELOG CHANGELOG +4 -0

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@

 Formerly known as 'gitlab-git-http-server'.

+v 4.2.1
+
+- Fix objectstore error shadowing !259
+
 v 4.2.0

 - Guess RemoteAddr from X-Forwarded-For !254

--- a/VERSION
+++ b/VERSION
-4.2.0
+4.2.1