diff options
-rw-r--r-- | CHANGELOG.md | 16 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | changelogs/unreleased/jc-upgrade-grpc.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/jc-virtual-storage-name-praefect.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/rs-more-cherry-pick-feedback.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/zj-health-check-praefect.yml | 5 | ||||
-rw-r--r-- | ruby/proto/gitaly/version.rb | 4 |
7 files changed, 19 insertions, 23 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f0e35a584..c4a9abd81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Gitaly changelog +## v1.68.0 + +#### Added +- Add virtual storage name to praefect config + https://gitlab.com/gitlab-org/gitaly/merge_requests/1525 +- Support health checks in Praefect + https://gitlab.com/gitlab-org/gitaly/merge_requests/1541 + +#### Changed +- Provide specifics about why a cherry-pick or revert has failed + https://gitlab.com/gitlab-org/gitaly/merge_requests/1543 + +#### Other +- Upgrade GRPC to 1.24.0 + https://gitlab.com/gitlab-org/gitaly/merge_requests/1539 + ## v1.67.0 #### Added @@ -1 +1 @@ -1.67.0 +1.68.0 diff --git a/changelogs/unreleased/jc-upgrade-grpc.yml b/changelogs/unreleased/jc-upgrade-grpc.yml deleted file mode 100644 index 6c19dd63f..000000000 --- a/changelogs/unreleased/jc-upgrade-grpc.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade GRPC to 1.24.0 -merge_request: 1539 -author: -type: other diff --git a/changelogs/unreleased/jc-virtual-storage-name-praefect.yml b/changelogs/unreleased/jc-virtual-storage-name-praefect.yml deleted file mode 100644 index c640c6c1e..000000000 --- a/changelogs/unreleased/jc-virtual-storage-name-praefect.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add virtual storage name to praefect config -merge_request: 1525 -author: -type: added diff --git a/changelogs/unreleased/rs-more-cherry-pick-feedback.yml b/changelogs/unreleased/rs-more-cherry-pick-feedback.yml deleted file mode 100644 index dc7e856ed..000000000 --- a/changelogs/unreleased/rs-more-cherry-pick-feedback.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Provide specifics about why a cherry-pick or revert has failed -merge_request: 1543 -author: -type: changed diff --git a/changelogs/unreleased/zj-health-check-praefect.yml b/changelogs/unreleased/zj-health-check-praefect.yml deleted file mode 100644 index 9fc776717..000000000 --- a/changelogs/unreleased/zj-health-check-praefect.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Support health checks in Praefect -merge_request: 1541 -author: -type: added diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb index c254e2b3a..fe65db897 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.67.0' + VERSION = '1.68.0' end |