diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-01-22 14:09:20 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-01-22 14:09:20 +0300 |
| commit | 0055ee638c52c7753081d5d3af00e6d9da1c60b3 (patch) | |
| tree | 84026488e1614560fdd520eb5f4668b24cc48a3b | |
| parent | fed0e1717f458e7d55b406b43210b19bacf2052d (diff) | |
Version 1.14.0v1.14.0
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/ruby-thread-exception.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/vendor-gitlab-shell-20190111.yml | 5 |
4 files changed, 11 insertions, 11 deletions
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 @@ -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 |