From 849a376de96a2a65422d67a0b41c2f782af7abf5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 19 Apr 2021 15:31:45 +0200
Subject: Merging upstream version 2.12.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d6a35d..2f154c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+2.12.1 - 2021-04-16
+===================
+
+### Fixes
+- Fix race condition when stashing files in multiple parallel invocations
+    - #1881 PR by @adamchainz.
+    - #1880 issue by @adamchainz.
+
 2.12.0 - 2021-04-06
 ===================
 
-- 
cgit v1.2.3