Merge branch 'make-8-3-0' into 'master'

Version 8.3.0 See merge request gitlab-org/gitlab-workhorse!361

Merge branch 'make-8-3-0' into 'master'
Version 8.3.0 See merge request gitlab-org/gitlab-workhorse!361
50c3937e · Nick Thomas · 76f69059 · 96635d14 · 50c3937e · 50c3937e
Commit 50c3937e authored Feb 05, 2019 by Nick Thomas
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CHANGELOG CHANGELOG +2 -0

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@ Formerly known as 'gitlab-git-http-server'.

 v 8.3.0

+- Count ^/-/ requests separately in prometheus !355
+- Statically link jaeger into Workhorse by default !359
 - Support encoded Content-Disposition fields !360

 v 8.2.0

--- a/VERSION
+++ b/VERSION
-8.2.0
+8.3.0