From c92bbb021a658e0090b0821a88458f14ff795225 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 26 Feb 2018 18:46:11 -0300
Subject: [PATCH] Preparing 1.22.2 release

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ab8e865..76b63e2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,14 @@
+pytest-xdist 1.22.2 (2018-02-26)
+================================
+
+Bug Fixes
+---------
+
+- Add backward compatibility for ``slaveoutput`` attribute to
+  ``WorkerController`` instances. (`#285
+  <https://github.com/pytest-dev/pytest-xdist/issues/285>`_)
+
+
 pytest-xdist 1.22.1 (2018-02-19)
 ================================
 
diff --git a/changelog/285.bugfix b/changelog/285.bugfix
deleted file mode 100644
index 8a2fa52..0000000
--- a/changelog/285.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add backward compatibility for ``slaveoutput`` attribute to ``WorkerController`` instances.