summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-07-13 13:14:34 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2018-07-13 13:14:34 +0000
commit9451c80ac9cd1866612da09b42915eb50942ae2b (patch)
tree8474f09dbe2ec76ef1f4be6342ef8d75d1b3eb10 /changelogs
parentbac2c47c8d2b3d609e369a5fbad12438f4efe09e (diff)
parentfd392cd7255cba80bc6ee0ce3139db3732392c19 (diff)
downloadgitlab-ce-9451c80ac9cd1866612da09b42915eb50942ae2b.tar.gz
Merge branch 'sh-fix-stderr-pipe-consumption' into 'master'
Avoid process deadlock in popen by consuming input pipes Closes gitlab-ee#6895 See merge request gitlab-org/gitlab-ce!20600
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-fix-stderr-pipe-consumption.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-stderr-pipe-consumption.yml b/changelogs/unreleased/sh-fix-stderr-pipe-consumption.yml
new file mode 100644
index 00000000000..b7366cf2569
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-stderr-pipe-consumption.yml
@@ -0,0 +1,5 @@
+---
+title: Avoid process deadlock in popen by consuming input pipes
+merge_request: 20600
+author:
+type: fixed