Merge branch 'changelog-6.0.2' into 'master'v6.0.2

Add CHANGELOG for 6.0.2

See merge request gitlab-org/gitlab-shell!187

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7b03f7b..6123299 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v6.0.2
+  - Use grpc-go 1.9.1 (!184)
+  - Update gitaly-proto and gitaly libs (!185)
+
 v6.0.1
   - Fix git push by removing a bad require in the pre-receive hook (!183)
 
diff --git a/VERSION b/VERSION
index 5fe6072..9b9a244 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.1
+6.0.2