From 0055ee638c52c7753081d5d3af00e6d9da1c60b3 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 22 Jan 2019 12:09:20 +0100 Subject: Version 1.14.0 --- CHANGELOG.md | 10 ++++++++++ VERSION | 2 +- changelogs/unreleased/ruby-thread-exception.yml | 5 ----- changelogs/unreleased/vendor-gitlab-shell-20190111.yml | 5 ----- 4 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 changelogs/unreleased/ruby-thread-exception.yml delete mode 100644 changelogs/unreleased/vendor-gitlab-shell-20190111.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c021ee59..e5697fbb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Gitaly changelog +## v1.14.0 + +#### Fixed +- Ensure that we kill ruby Gitlab::Git::Popen reader threads + https://gitlab.com/gitlab-org/gitaly/merge_requests/1040 + +#### Other +- Vendor gitlab-shell at 6c5b195353a632095d7f6 + https://gitlab.com/gitlab-org/gitaly/merge_requests/1037 + ## v1.13.0 #### Fixed diff --git a/VERSION b/VERSION index feaae22ba..850e74240 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.13.0 +1.14.0 diff --git a/changelogs/unreleased/ruby-thread-exception.yml b/changelogs/unreleased/ruby-thread-exception.yml deleted file mode 100644 index 5c60865b9..000000000 --- a/changelogs/unreleased/ruby-thread-exception.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Ensure that we kill ruby Gitlab::Git::Popen reader threads -merge_request: 1040 -author: -type: fixed diff --git a/changelogs/unreleased/vendor-gitlab-shell-20190111.yml b/changelogs/unreleased/vendor-gitlab-shell-20190111.yml deleted file mode 100644 index 208ae4919..000000000 --- a/changelogs/unreleased/vendor-gitlab-shell-20190111.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Vendor gitlab-shell at 6c5b195353a632095d7f6 -merge_request: 1037 -author: -type: other -- cgit v1.2.3