Merge branch 'changelog-3.6.0' into 'master'

Changelog for 3.6.0 See merge request gitlab-org/gitlab-workhorse!229

Merge branch 'changelog-3.6.0' into 'master'
Changelog for 3.6.0 See merge request gitlab-org/gitlab-workhorse!229
51fe78e3 · Nick Thomas · fa781569 · 13393001 · 51fe78e3 · 51fe78e3
Commit 51fe78e3 authored Feb 05, 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'.

+v3.6.0
+
+- Introduce a `send-url:` method that allows to serve remote HTTP/GET file, like S3-based file !228
+
 v3.5.1

 - Use grpc-go 1.9.1 (!225)

--- a/VERSION
+++ b/VERSION
-3.5.1
+3.6.0