summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-08-22 14:21:05 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-08-22 14:21:05 +0000
commit4e4f8534fd5154c35c182379a31201c3a5fe9c20 (patch)
tree8d264aed73be16c2932a8e3cb7df938934cbf974 /changelogs
parentdc5d755812908455b23f2c9afbec2dab24a3e5ad (diff)
parentd78f0724d9cc3dd7c1f22cef54ad59f8d2b579c4 (diff)
downloadgitlab-ce-4e4f8534fd5154c35c182379a31201c3a5fe9c20.tar.gz
Merge branch 'avoid-race-condition-of-archive-trace-cron-worker' into 'master'
Avoid conflicts between ArchiveTracesCronWorker and ArchiveTraceWorker See merge request gitlab-org/gitlab-ce!31376
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/avoid-race-condition-of-archive-trace-cron-worker.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/avoid-race-condition-of-archive-trace-cron-worker.yml b/changelogs/unreleased/avoid-race-condition-of-archive-trace-cron-worker.yml
new file mode 100644
index 00000000000..b3f84ec32d2
--- /dev/null
+++ b/changelogs/unreleased/avoid-race-condition-of-archive-trace-cron-worker.yml
@@ -0,0 +1,5 @@
+---
+title: Avoid conflicts between ArchiveTracesCronWorker and ArchiveTraceWorker
+merge_request: 31376
+author:
+type: fixed