From 8abee43f7ea0065d3f23a2ed475abfd63d902f9d Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 6 Oct 2016 14:09:28 +0200
Subject: [PATCH] Version 0.8.4

---
 CHANGELOG | 5 +++++
 VERSION   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4d264e914dbd2..8f6e0cee41469 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 
 Formerly known as 'gitlab-git-http-server'.
 
+v0.8.4
+
+Fix Go 1.5 compatibility broken in 0.8.3. Update CI configuration so
+that tests run on Go 1.5, 1.6 and 1.7 (was only 1.6 before).
+
 v0.8.3
 
 Add rate-limiting feature for /api requests (disabled by default).
diff --git a/VERSION b/VERSION
index ee94dd834b539..b60d71966ae91 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.3
+0.8.4
-- 
GitLab