From 30b540cd1f70266fbb88883407a9b85dff0e1cb0 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Tue, 1 Oct 2019 10:35:55 +0200
Subject: [PATCH] prepare 1.30.0 release

---
 CHANGELOG.rst             | 22 ++++++++++++++++++++++
 changelog/448.feature.rst |  9 ---------
 changelog/467.bugfix.rst  |  1 -
 3 files changed, 22 insertions(+), 10 deletions(-)
 delete mode 100644 changelog/448.feature.rst
 delete mode 100644 changelog/467.bugfix.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 81602d0..ff35bfe 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -411,6 +411,28 @@ Improved Documentation
 
 .. towncrier release notes start
 
+pytest-xdist 1.30.0 (2019-10-01)
+================================
+
+Features
+--------
+
+- `#448 <https://github.com/pytest-dev/pytest-xdist/issues/448>`_: Initialization between workers and master nodes is now more consistent, which fixes a number of
+  long-standing issues related to startup with the ``-c`` option.
+
+  Issues:
+
+  * `#6 <https://github.com/pytest-dev/pytest-xdist/issues/6>`__: Poor interaction between ``-n#`` and ``-c X.cfg``
+  * `#445 <https://github.com/pytest-dev/pytest-xdist/issues/445>`__: pytest-xdist is not reporting the same nodeid as pytest does
+
+  This however only works with **pytest 5.1 or later**, as it required changes in pytest itself.
+
+
+Bug Fixes
+---------
+
+- `#467 <https://github.com/pytest-dev/pytest-xdist/issues/467>`_: Fix crash issues related to running xdist with the terminal plugin disabled.
+
 
 1.17.0
 ------
diff --git a/changelog/448.feature.rst b/changelog/448.feature.rst
deleted file mode 100644
index 2a5410a..0000000
--- a/changelog/448.feature.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Initialization between workers and master nodes is now more consistent, which fixes a number of
-long-standing issues related to startup with the ``-c`` option.
-
-Issues:
-
-* `#6 <https://github.com/pytest-dev/pytest-xdist/issues/6>`__: Poor interaction between ``-n#`` and ``-c X.cfg``
-* `#445 <https://github.com/pytest-dev/pytest-xdist/issues/445>`__: pytest-xdist is not reporting the same nodeid as pytest does
-
-This however only works with **pytest 5.1 or later**, as it required changes in pytest itself.
diff --git a/changelog/467.bugfix.rst b/changelog/467.bugfix.rst
deleted file mode 100644
index 5345c02..0000000
--- a/changelog/467.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash issues related to running xdist with the terminal plugin disabled.