From aacedbaac8013e341be496cbb5f250fb61094313 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 18 Sep 2019 18:15:34 +0200 Subject: Version 1.65.0 --- CHANGELOG.md | 16 ++++++++++++++++ VERSION | 2 +- changelogs/unreleased/jc-add-replication-latency.yml | 5 ----- changelogs/unreleased/jv-walker-nil-checks.yml | 5 ----- changelogs/unreleased/po-demo-fix-replication.yml | 5 ----- changelogs/unreleased/po-git-dsl.yml | 5 ----- changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml | 5 ----- ruby/proto/gitaly/version.rb | 4 ++-- 8 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 changelogs/unreleased/jc-add-replication-latency.yml delete mode 100644 changelogs/unreleased/jv-walker-nil-checks.yml delete mode 100644 changelogs/unreleased/po-demo-fix-replication.yml delete mode 100644 changelogs/unreleased/po-git-dsl.yml delete mode 100644 changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index ffd963268..436ea3d4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Gitaly changelog +## v1.65.0 + +#### Fixed +- Replicator fixes from demo + https://gitlab.com/gitlab-org/gitaly/merge_requests/1487 +- Prevent nil panics in housekeeping.Perform + https://gitlab.com/gitlab-org/gitaly/merge_requests/1492 +- Upgrade Rouge to v3.11.0 + https://gitlab.com/gitlab-org/gitaly/merge_requests/1493 + +#### Other +- Git Command DSL + https://gitlab.com/gitlab-org/gitaly/merge_requests/1476 +- Measure replication latency + https://gitlab.com/gitlab-org/gitaly/merge_requests/1481 + ## v1.64.0 #### Added diff --git a/VERSION b/VERSION index 940573042..902c74186 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.64.0 +1.65.0 diff --git a/changelogs/unreleased/jc-add-replication-latency.yml b/changelogs/unreleased/jc-add-replication-latency.yml deleted file mode 100644 index 37cce1bcb..000000000 --- a/changelogs/unreleased/jc-add-replication-latency.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Measure replication latency -merge_request: 1481 -author: -type: other diff --git a/changelogs/unreleased/jv-walker-nil-checks.yml b/changelogs/unreleased/jv-walker-nil-checks.yml deleted file mode 100644 index 9329f746e..000000000 --- a/changelogs/unreleased/jv-walker-nil-checks.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent nil panics in housekeeping.Perform -merge_request: 1492 -author: -type: fixed diff --git a/changelogs/unreleased/po-demo-fix-replication.yml b/changelogs/unreleased/po-demo-fix-replication.yml deleted file mode 100644 index 5f48f6a07..000000000 --- a/changelogs/unreleased/po-demo-fix-replication.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replicator fixes from demo -merge_request: 1487 -author: -type: fixed diff --git a/changelogs/unreleased/po-git-dsl.yml b/changelogs/unreleased/po-git-dsl.yml deleted file mode 100644 index 7e8aefd74..000000000 --- a/changelogs/unreleased/po-git-dsl.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Git Command DSL -merge_request: 1476 -author: -type: other diff --git a/changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml b/changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml deleted file mode 100644 index b3214eaf1..000000000 --- a/changelogs/unreleased/sh-upgrade-rouge-3-11-0.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade Rouge to v3.11.0 -merge_request: 1493 -author: -type: fixed diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb index 858d7b916..8ba953420 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 /Users/jacobvosmaer/Desktop/gitlab-development-kit/gitaly/src/gitlab.com/gitlab-org/gitaly/_support/release module Gitaly - VERSION = '1.64.0' + VERSION = '1.65.0' end -- cgit v1.2.3