From adaa10f2852ff9918518d07bfbdc6935ef982403 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 5 Oct 2017 16:55:45 -0300
Subject: [PATCH] Release 1.20.1

---
 CHANGELOG.rst       | 14 ++++++++++++++
 changelog/45.bugfix |  1 -
 changelog/5.bugfix  |  1 -
 3 files changed, 14 insertions(+), 2 deletions(-)
 delete mode 100644 changelog/45.bugfix
 delete mode 100644 changelog/5.bugfix

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 639ef83..917b450 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,17 @@
+pytest-xdist 1.20.1 (2017-10-05)
+================================
+
+Bug Fixes
+---------
+
+- Fix hang when all worker nodes crash and restart limit is reached (`#45
+  <https://github.com/pytest-dev/pytest-xdist/issues/45>`_)
+
+- Fix issue where the -n option would still run distributed tests when pytest
+  was run with the --collect-only option (`#5
+  <https://github.com/pytest-dev/pytest-xdist/issues/5>`_)
+
+
 pytest-xdist 1.20.0 (2017-08-17)
 ================================
 
diff --git a/changelog/45.bugfix b/changelog/45.bugfix
deleted file mode 100644
index e4727de..0000000
--- a/changelog/45.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix hang when all worker nodes crash and restart limit is reached
diff --git a/changelog/5.bugfix b/changelog/5.bugfix
deleted file mode 100644
index a3e1711..0000000
--- a/changelog/5.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue where the -n option would still run distributed tests when pytest was run with the --collect-only option