Merge pull request #267 from nicoddemus/release-1.22.0

Prepare release 1.22.0
2018-01-11 18:13:41 -02:00
parent 0181829ba7 6c68478997
commit 3098f27731
2 changed files with 11 additions and 1 deletions
--- 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)
 ================================

--- a/changelog/266.feature
+++ b/changelog/266.feature
@@ -1 +0,0 @@
-Add support for the ``pytest_runtest_logfinish`` hook which will be released in pytest 3.4.
				`@@ -1 +0,0 @@`
				Add support for the ``pytest_runtest_logfinish`` hook which will be released in pytest 3.4.