diff options
-rw-r--r-- | CHANGELOG.md | 10 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | changelogs/unreleased/1474-search-files-bytes.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/find-commits-use-chunker.yml | 5 |
5 files changed, 11 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a5235dc0..dc87be424 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Gitaly changelog +## v1.18.0 + +#### Other +- Make clear there is no []byte reuse bug in SearchFilesByContent + https://gitlab.com/gitlab-org/gitaly/merge_requests/1055 +- Use chunker in FindCommits + https://gitlab.com/gitlab-org/gitaly/merge_requests/1059 +- Statically link jaeger into Gitaly by default + https://gitlab.com/gitlab-org/gitaly/merge_requests/1063 + ## v1.17.0 #### Other @@ -1 +1 @@ -1.17.0 +1.18.0 diff --git a/changelogs/unreleased/1474-search-files-bytes.yml b/changelogs/unreleased/1474-search-files-bytes.yml deleted file mode 100644 index 9e25f8613..000000000 --- a/changelogs/unreleased/1474-search-files-bytes.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make clear there is no []byte reuse bug in SearchFilesByContent -merge_request: 1055 -author: -type: other diff --git a/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml b/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml deleted file mode 100644 index fa1b2fc92..000000000 --- a/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Statically link jaeger into Gitaly by default -merge_request: 1063 -author: -type: other diff --git a/changelogs/unreleased/find-commits-use-chunker.yml b/changelogs/unreleased/find-commits-use-chunker.yml deleted file mode 100644 index 03e955273..000000000 --- a/changelogs/unreleased/find-commits-use-chunker.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use chunker in FindCommits -merge_request: 1059 -author: -type: other |