From 6c684789974e2b21dcf01b342704943d45f4a551 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 11 Jan 2018 17:45:31 -0200
Subject: [PATCH] Prepare release 1.22.0

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ccad602..6e7033a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,14 @@
+pytest-xdist 1.22.0 (2018-01-11)
+================================
+
+Features
+--------
+
+- Add support for the ``pytest_runtest_logfinish`` hook which will be released
+  in pytest 3.4. (`#266
+  <https://github.com/pytest-dev/pytest-xdist/issues/266>`_)
+
+
 pytest-xdist 1.21.0 (2017-12-22)
 ================================
 
diff --git a/changelog/266.feature b/changelog/266.feature
deleted file mode 100644
index 205ce0f..0000000
--- a/changelog/266.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for the ``pytest_runtest_logfinish`` hook which will be released in pytest 3.4.