From 4dd2978031eaf7017c84a1cc77667379a2b11c64 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sun, 28 Apr 2024 22:19:22 +0300
Subject: [PATCH] Release 3.6.1

---
 CHANGELOG.rst         | 10 ++++++++++
 changelog/1071.bugfix |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)
 delete mode 100644 changelog/1071.bugfix

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 875b9b49..2f29201a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,16 @@
+pytest-xdist 3.6.1 (2024-04-28)
+===============================
+
+Bug Fixes
+---------
+
+- `#1071 <https://github.com/pytest-dev/pytest-xdist/issues/1071>`_: Add backward compatibility for deadlock issue with the ``execnet`` new ``main_thread_only`` "execmodel" triggered when pytest-cov accesses rinfo.
+
 pytest-xdist 3.6.0 (2024-04-19)
 ===============================
 
+This release was YANKED due to a regression fixed in 3.6.1.
+
 Features
 --------
 
diff --git a/changelog/1071.bugfix b/changelog/1071.bugfix
deleted file mode 100644
index 089a4ef1..00000000
--- a/changelog/1071.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add backward compatibility for deadlock issue with the ``execnet`` new ``main_thread_only`` "execmodel" triggered when pytest-cov accesses rinfo.