From 9b2163f028ec58d9360e6aaf064c4f94a39b66ec Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 22 Dec 2017 17:34:12 -0200
Subject: [PATCH] Update CHANGELOG with towncrier

---
 CHANGELOG.rst         | 26 ++++++++++++++++++++++++++
 changelog/241.bugfix  |  1 -
 changelog/242.feature |  1 -
 changelog/259.removal |  1 -
 4 files changed, 26 insertions(+), 3 deletions(-)
 delete mode 100644 changelog/241.bugfix
 delete mode 100644 changelog/242.feature
 delete mode 100644 changelog/259.removal

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 917b450..ccad602 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,29 @@
+pytest-xdist 1.21.0 (2017-12-22)
+================================
+
+Deprecations and Removals
+-------------------------
+
+- Drop support for EOL Python 2.6. (`#259
+  <https://github.com/pytest-dev/pytest-xdist/issues/259>`_)
+
+
+Features
+--------
+
+- New ``--dist=loadfile`` option which load-distributes test to workers grouped
+  by the file the tests live in. (`#242
+  <https://github.com/pytest-dev/pytest-xdist/issues/242>`_)
+
+
+Bug Fixes
+---------
+
+- Fix accidental mutation of test report during serialization causing longrepr
+  string-ification to break. (`#241
+  <https://github.com/pytest-dev/pytest-xdist/issues/241>`_)
+
+
 pytest-xdist 1.20.1 (2017-10-05)
 ================================
 
diff --git a/changelog/241.bugfix b/changelog/241.bugfix
deleted file mode 100644
index 109fac6..0000000
--- a/changelog/241.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix accidental mutation of test report during serialization causing longrepr string-ification to break.
\ No newline at end of file
diff --git a/changelog/242.feature b/changelog/242.feature
deleted file mode 100644
index b767adb..0000000
--- a/changelog/242.feature
+++ /dev/null
@@ -1 +0,0 @@
-New ``--dist=loadfile`` option which load-distributes test to workers grouped by the file the tests live in.
diff --git a/changelog/259.removal b/changelog/259.removal
deleted file mode 100644
index 110c9bc..0000000
--- a/changelog/259.removal
+++ /dev/null
@@ -1 +0,0 @@
-Drop support for EOL Python 2.6.
\ No newline at end of file