From c5f0c34d38b30819b7f0daf31adc7c9623f945ac Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 27 Jul 2018 09:17:18 -0300
Subject: [PATCH] Prepare release 1.22.4

---
 CHANGELOG.rst            | 13 +++++++++++++
 changelog/305.bugfix.rst |  3 ---
 changelog/316.bugfix     |  1 -
 3 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 changelog/305.bugfix.rst
 delete mode 100644 changelog/316.bugfix

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 07713e3..3519955 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,16 @@
+pytest-xdist 1.22.4 (2018-07-27)
+================================
+
+Bug Fixes
+---------
+
+- `#305 <https://github.com/pytest-dev/pytest-xdist/issues/305>`_: Remove last references to obsolete ``py.code``.
+
+  Remove some unnecessary references to ``py.builtin``.
+
+- `#316 <https://github.com/pytest-dev/pytest-xdist/issues/316>`_: Workaround cpu detection on Travis CI.
+
+
 pytest-xdist 1.22.3 (2018-07-23)
 ================================
 
diff --git a/changelog/305.bugfix.rst b/changelog/305.bugfix.rst
deleted file mode 100644
index afb40f4..0000000
--- a/changelog/305.bugfix.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Remove last references to obsolete ``py.code``.
-
-Remove some unnecessary references to ``py.builtin``.
diff --git a/changelog/316.bugfix b/changelog/316.bugfix
deleted file mode 100644
index aef300c..0000000
--- a/changelog/316.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Workaround cpu detection on Travis CI.