Merge branch 'changelog-6.0.2' into 'master'

Add CHANGELOG for 6.0.2 See merge request gitlab-org/gitlab-shell!187

Merge branch 'changelog-6.0.2' into 'master'
Add CHANGELOG for 6.0.2 See merge request gitlab-org/gitlab-shell!187
45591555 · Robert Speicher · 2be40f7e · 5d0c4efd · 45591555 · 45591555
Commit 45591555 authored Jan 19, 2018 by Robert Speicher
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
+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)


--- a/VERSION
+++ b/VERSION
-6.0.1
+6.0.2