diff options
author | jramsay <jcai@gitlab.com> | 2019-10-15 18:53:40 +0300 |
---|---|---|
committer | jramsay <jcai@gitlab.com> | 2019-10-15 18:53:40 +0300 |
commit | 1f55c54bdd3dddb4e30f3a7f6be96f2c5f4c78e1 (patch) | |
tree | 59bbe6bc1b4eb9525f837a235f0d269ff33ed80e | |
parent | abec38c29d2a67bf6f16def8c3456c22593cd3d6 (diff) |
Version 1.69.0v1.69.01-69-stable
-rw-r--r-- | CHANGELOG.md | 10 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | changelogs/unreleased/jc-fix-consolidated-server-info.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/jc-praefect-object-pools.yml | 5 | ||||
-rw-r--r-- | ruby/proto/gitaly/version.rb | 2 |
5 files changed, 12 insertions, 12 deletions
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 @@ -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 |