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:
authorJohn Cai <jcai@gitlab.com>2019-05-02 23:25:26 +0300
committerJohn Cai <jcai@gitlab.com>2019-05-02 23:25:26 +0300
commitd2fbeabebfbbdf83fede4e4f939eeac22c661c5e (patch)
tree29905211193bc76196418a6d62b7146716a069c7
parent81712c27e13def0af519f8429e327e9524306297 (diff)
Version 1.40.0v1.40.0
-rw-r--r--CHANGELOG.md6
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/jc-do-not-close-ttl-channel.yml5
3 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24e2a002f..a43b85bf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Gitaly changelog
+## v1.40.0
+
+#### Fixed
+- Do not close the TTL channel twice
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1235
+
## v1.39.0
#### Added
diff --git a/VERSION b/VERSION
index 5edffce6d..32b7211cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.39.0
+1.40.0
diff --git a/changelogs/unreleased/jc-do-not-close-ttl-channel.yml b/changelogs/unreleased/jc-do-not-close-ttl-channel.yml
deleted file mode 100644
index e66a72d58..000000000
--- a/changelogs/unreleased/jc-do-not-close-ttl-channel.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Do not close the TTL channel twice
-merge_request: 1235
-author:
-type: fixed