From 2f889883152c873edb430f090d44fba2ef3f5a4c Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Fri, 13 Sep 2019 15:18:51 +0200
Subject: Version 1.64.0

---
 CHANGELOG.md                                            | 17 +++++++++++++++++
 VERSION                                                 |  2 +-
 .../unreleased/add-first-parent-to-find-commits.yml     |  5 -----
 changelogs/unreleased/jc-confirm-checksums.yml          |  5 -----
 changelogs/unreleased/po-deprecation-warnings.yml       |  5 -----
 changelogs/unreleased/sh-update-rouge.yml               |  5 -----
 ruby/proto/gitaly/version.rb                            |  4 ++--
 7 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 changelogs/unreleased/add-first-parent-to-find-commits.yml
 delete mode 100644 changelogs/unreleased/jc-confirm-checksums.yml
 delete mode 100644 changelogs/unreleased/po-deprecation-warnings.yml
 delete mode 100644 changelogs/unreleased/sh-update-rouge.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5c9bc83a..ffd963268 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Gitaly changelog
 
+## v1.64.0
+
+#### Added
+- Confirm checksums after replication
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1479
+- FindCommits/CommitCounts: Add support for `first_parent` parameter
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1463
+  Contributed by jhenkens
+
+#### Other
+- Update Rouge to v3.10.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1475
+
+#### Security
+- Add dedicated CI job for deprecation warnings
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1480
+
 ## v1.63.0
 
 #### Added
diff --git a/VERSION b/VERSION
index af92bdd9f..940573042 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.63.0
+1.64.0
diff --git a/changelogs/unreleased/add-first-parent-to-find-commits.yml b/changelogs/unreleased/add-first-parent-to-find-commits.yml
deleted file mode 100644
index 36058f078..000000000
--- a/changelogs/unreleased/add-first-parent-to-find-commits.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'FindCommits/CommitCounts: Add support for `first_parent` parameter'
-merge_request: 1463
-author: jhenkens
-type: added
diff --git a/changelogs/unreleased/jc-confirm-checksums.yml b/changelogs/unreleased/jc-confirm-checksums.yml
deleted file mode 100644
index e25906ead..000000000
--- a/changelogs/unreleased/jc-confirm-checksums.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Confirm checksums after replication
-merge_request: 1479
-author:
-type: added
diff --git a/changelogs/unreleased/po-deprecation-warnings.yml b/changelogs/unreleased/po-deprecation-warnings.yml
deleted file mode 100644
index 5acaf040d..000000000
--- a/changelogs/unreleased/po-deprecation-warnings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add dedicated CI job for deprecation warnings
-merge_request: 1480
-author:
-type: security
diff --git a/changelogs/unreleased/sh-update-rouge.yml b/changelogs/unreleased/sh-update-rouge.yml
deleted file mode 100644
index 35ae3fd79..000000000
--- a/changelogs/unreleased/sh-update-rouge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update Rouge to v3.10.0
-merge_request: 1475
-author:
-type: other
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index 2f82de7ca..858d7b916 100644
--- a/ruby/proto/gitaly/version.rb
+++ b/ruby/proto/gitaly/version.rb
@@ -1,4 +1,4 @@
-# This file was auto-generated by _support/release
+# This file was auto-generated by ./_support/release
 module Gitaly
-  VERSION = '1.63.0'
+  VERSION = '1.64.0'
 end
-- 
cgit v1.2.3