diff options
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/deduplicate-ssl-certs.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-filenames-with-curly-braces.yml | 5 |
4 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 44d3ea1a5..d8c280d07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Gitaly changelog +## v1.11.0 + +#### Fixed +- Fix incorrect tree entries retrieved with directories that have curly braces + https://gitlab.com/gitlab-org/gitaly/merge_requests/1013 +- Deduplicate CA in gitaly tls + https://gitlab.com/gitlab-org/gitaly/merge_requests/1005 + ## v1.10.0 #### Added @@ -1 +1 @@ -1.10.0 +1.11.0 diff --git a/changelogs/unreleased/deduplicate-ssl-certs.yml b/changelogs/unreleased/deduplicate-ssl-certs.yml deleted file mode 100644 index d626f81dc..000000000 --- a/changelogs/unreleased/deduplicate-ssl-certs.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Deduplicate CA in gitaly tls -merge_request: 1005 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-filenames-with-curly-braces.yml b/changelogs/unreleased/sh-fix-filenames-with-curly-braces.yml deleted file mode 100644 index 45ee9f6f6..000000000 --- a/changelogs/unreleased/sh-fix-filenames-with-curly-braces.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix incorrect tree entries retrieved with directories that have curly braces -merge_request: 1013 -author: -type: fixed |