From de993e1ee3c67eb2c79d8c9cd46911ab912749a4 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 19 Feb 2018 18:10:50 -0300
Subject: [PATCH] Prepare changelog for 1.22.1

---
 CHANGELOG.rst         | 19 +++++++++++++++++++
 changelog/234.trivial |  1 -
 changelog/257.bugfix  |  1 -
 3 files changed, 19 insertions(+), 2 deletions(-)
 delete mode 100644 changelog/234.trivial
 delete mode 100644 changelog/257.bugfix

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6e7033a..ab8e865 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,22 @@
+pytest-xdist 1.22.1 (2018-02-19)
+================================
+
+Bug Fixes
+---------
+
+- Fix issue when using ``loadscope`` or ``loadfile`` where tests would fail to
+  start if the first scope had only one test. (`#257
+  <https://github.com/pytest-dev/pytest-xdist/issues/257>`_)
+
+
+Trivial Changes
+---------------
+
+- Change terminology used by ``pytest-xdist`` to *master* and *worker* in
+  arguments and messages (for example ``--max-worker-reset``). (`#234
+  <https://github.com/pytest-dev/pytest-xdist/issues/234>`_)
+
+
 pytest-xdist 1.22.0 (2018-01-11)
 ================================
 
diff --git a/changelog/234.trivial b/changelog/234.trivial
deleted file mode 100644
index 1184206..0000000
--- a/changelog/234.trivial
+++ /dev/null
@@ -1 +0,0 @@
-Change terminology used by ``pytest-xdist`` to *master* and *worker* in arguments and messages (for example ``--max-worker-reset``).
diff --git a/changelog/257.bugfix b/changelog/257.bugfix
deleted file mode 100644
index 6b3cde6..0000000
--- a/changelog/257.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue when using ``loadscope`` or ``loadfile`` where tests would fail to start if the first scope had only one test.