From 1f55c54bdd3dddb4e30f3a7f6be96f2c5f4c78e1 Mon Sep 17 00:00:00 2001
From: jramsay <jcai@gitlab.com>
Date: Tue, 15 Oct 2019 08:53:40 -0700
Subject: Version 1.69.0

---
 CHANGELOG.md                                              | 10 ++++++++++
 VERSION                                                   |  2 +-
 changelogs/unreleased/jc-fix-consolidated-server-info.yml |  5 -----
 changelogs/unreleased/jc-praefect-object-pools.yml        |  5 -----
 ruby/proto/gitaly/version.rb                              |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 changelogs/unreleased/jc-fix-consolidated-server-info.yml
 delete mode 100644 changelogs/unreleased/jc-praefect-object-pools.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4a9abd81..da60ce32b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Gitaly changelog
 
+## v1.69.0
+
+#### Fixed
+- Fix praefect server info to include git version, server version
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1550
+
+#### Other
+- Enable second repository to have its storage re-written
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1548
+
 ## v1.68.0
 
 #### Added
diff --git a/VERSION b/VERSION
index ee2f4ca91..493498565 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.68.0
+1.69.0
diff --git a/changelogs/unreleased/jc-fix-consolidated-server-info.yml b/changelogs/unreleased/jc-fix-consolidated-server-info.yml
deleted file mode 100644
index 6851be625..000000000
--- a/changelogs/unreleased/jc-fix-consolidated-server-info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix praefect server info to include git version, server version
-merge_request: 1550
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-praefect-object-pools.yml b/changelogs/unreleased/jc-praefect-object-pools.yml
deleted file mode 100644
index ab30f0e2c..000000000
--- a/changelogs/unreleased/jc-praefect-object-pools.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable second repository to have its storage re-written
-merge_request: 1548
-author:
-type: other
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index fe65db897..156e1ae1c 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
 module Gitaly
-  VERSION = '1.68.0'
+  VERSION = '1.69.0'
 end
-- 
cgit v1.2.3