From dba68518fc7f7660b94ddbc42c982a62574ec5c4 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 27 Jul 2018 17:07:40 -0300
Subject: [PATCH] Prepare release 1.22.5

---
 CHANGELOG.rst            | 13 +++++++++++++
 changelog/321.bugfix.rst |  5 -----
 2 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 changelog/321.bugfix.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3519955..76bf02c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,16 @@
+pytest-xdist 1.22.5 (2018-07-27)
+================================
+
+Bug Fixes
+---------
+
+- `#321 <https://github.com/pytest-dev/pytest-xdist/issues/321>`_: Revert change that dropped support for ``pytest<3.4``.
+
+  This change caused problems in some installations, and was a mistaken
+  in the first place as we should not change version requirements
+  in bug-fix releases unless they fix an actual bug.
+
+
 pytest-xdist 1.22.4 (2018-07-27)
 ================================
 
diff --git a/changelog/321.bugfix.rst b/changelog/321.bugfix.rst
deleted file mode 100644
index e4be545..0000000
--- a/changelog/321.bugfix.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Revert change that dropped support for ``pytest<3.4``.
-
-This change caused problems in some installations, and was a mistaken
-in the first place as we should not change version requirements
-in bug-fix releases unless they fix an actual bug.