From 5c46cdf62d2cc47924f98150fbe738aae5258a54 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 17 Aug 2017 18:33:50 -0300
Subject: [PATCH 1/2] Mention flaky in the changelog for #206

---
 changelog/206.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/206.feature b/changelog/206.feature
index 90296b3..566f811 100644
--- a/changelog/206.feature
+++ b/changelog/206.feature
@@ -1,2 +1,2 @@
 ``xdist`` now supports tests to log results multiple times, improving integration with plugins which require
-it like `pytest-rerunfailures <https://github.com/gocept/pytest-rerunfailures>_`.
+it like `pytest-rerunfailures <https://github.com/gocept/pytest-rerunfailures>_` and `flaky <https://pypi.python.org/pypi/flaky>`_.

From 577418f28c2c71ef1dc49f79641f8b7cd413ea60 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 17 Aug 2017 18:34:03 -0300
Subject: [PATCH 2/2] Prepare release 1.20.0

---
 CHANGELOG.rst         | 21 +++++++++++++++++++++
 changelog/124.bugfix  |  1 -
 changelog/206.feature |  2 --
 3 files changed, 21 insertions(+), 3 deletions(-)
 delete mode 100644 changelog/124.bugfix
 delete mode 100644 changelog/206.feature

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d23dbb7..39d269e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,24 @@
+pytest-xdist 1.20.0 (2017-08-17)
+================================
+
+Features
+--------
+
+- ``xdist`` now supports tests to log results multiple times, improving
+  integration with plugins which require it like `pytest-rerunfailures
+  <https://github.com/gocept/pytest-rerunfailures>_` and `flaky
+  <https://pypi.python.org/pypi/flaky>`_. (`#206 <https://github.com/pytest-
+  dev/pytest-xdist/issues/206>`_)
+
+
+Bug Fixes
+---------
+
+- Fix issue where tests were being incorrectly identified if a worker crashed
+  during the ``teardown`` stage of the test. (`#124 <https://github.com/pytest-
+  dev/pytest-xdist/issues/124>`_)
+
+
 pytest-xdist 1.19.1 (2017-08-10)
 ================================
 
diff --git a/changelog/124.bugfix b/changelog/124.bugfix
deleted file mode 100644
index b73ee67..0000000
--- a/changelog/124.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue where tests were being incorrectly identified if a worker crashed during the ``teardown`` stage of the test.
diff --git a/changelog/206.feature b/changelog/206.feature
deleted file mode 100644
index 566f811..0000000
--- a/changelog/206.feature
+++ /dev/null
@@ -1,2 +0,0 @@
-``xdist`` now supports tests to log results multiple times, improving integration with plugins which require
-it like `pytest-rerunfailures <https://github.com/gocept/pytest-rerunfailures>_` and `flaky <https://pypi.python.org/pypi/flaky>`_.