Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-02-06 20:33:48 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-02-06 20:33:48 +0300
commit8669ad746073d6d29eba9f06199ce749436131c0 (patch)
treed02de0291ffa8aebdebbe2599aa4c12e1098d6a5
parentb6b98d9a0f0afb97d1a6009d8b509df0d0e1555c (diff)
Version 1.18.0v1.18.0
-rw-r--r--CHANGELOG.md10
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/1474-search-files-bytes.yml5
-rw-r--r--changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml5
-rw-r--r--changelogs/unreleased/find-commits-use-chunker.yml5
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
diff --git a/VERSION b/VERSION
index 092afa15d..84cc52946 100644
--- a/VERSION
+++ b/VERSION
@@ -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