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:
authorPaul Okstad <pokstad@gitlab.com>2019-05-17 22:29:57 +0300
committerPaul Okstad <pokstad@gitlab.com>2019-05-17 22:29:57 +0300
commita38e0b95f31eadc6b23c05bcd8af9ee0d2da4d65 (patch)
tree4cd51a34c273808e50760bb0a0fa33fb65a0db08
parent91990a190127e59a48005be2e3e238406575006d (diff)
Version 1.42.1v1.42.1
-rw-r--r--CHANGELOG.md6
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/ac-wrapper-check-pid.yml5
3 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f41733076..931a5314d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Gitaly changelog
+## v1.42.1
+
+#### Fixed
+- Check if PID belongs to Gitaly before adopting an existing process
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1254
+
## v1.42.0
#### Other
diff --git a/VERSION b/VERSION
index a50908ca3..e640847f9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.42.0
+1.42.1
diff --git a/changelogs/unreleased/ac-wrapper-check-pid.yml b/changelogs/unreleased/ac-wrapper-check-pid.yml
deleted file mode 100644
index df0b075ba..000000000
--- a/changelogs/unreleased/ac-wrapper-check-pid.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Check if PID belongs to Gitaly before adopting an existing process"
-merge_request: 1254
-author:
-type: fixed