From 7bf654775dcd2fef9c0ebafbea982b7d180b740e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 27 Jul 2020 19:36:42 -0300
Subject: [PATCH] Release 1.34.0

---
 CHANGELOG.rst             | 19 +++++++++++++++++++
 changelog/478.bugfix.rst  |  1 -
 changelog/549.feature.rst |  1 -
 changelog/558.bugfix.rst  |  1 -
 changelog/562.bugfix.rst  |  1 -
 5 files changed, 19 insertions(+), 4 deletions(-)
 delete mode 100644 changelog/478.bugfix.rst
 delete mode 100644 changelog/549.feature.rst
 delete mode 100644 changelog/558.bugfix.rst
 delete mode 100644 changelog/562.bugfix.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 11a2958..f071763 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,22 @@
+pytest-xdist 1.34.0 (2020-07-27)
+================================
+
+Features
+--------
+
+- `#549 <https://github.com/pytest-dev/pytest-xdist/issues/549>`_: Make ``--pdb`` imply ``--dist no``, as the two options cannot really work together at the moment.
+
+
+Bug Fixes
+---------
+
+- `#478 <https://github.com/pytest-dev/pytest-xdist/issues/478>`_: Fix regression with duplicated arguments via $PYTEST_ADDOPTS in 1.30.0.
+
+- `#558 <https://github.com/pytest-dev/pytest-xdist/issues/558>`_: Fix ``rsyncdirs`` usage with pytest 6.0.
+
+- `#562 <https://github.com/pytest-dev/pytest-xdist/issues/562>`_: Do not trigger the deprecated ``pytest_warning_captured`` in pytest 6.0+.
+
+
 pytest-xdist 1.33.0 (2020-07-09)
 ================================
 
diff --git a/changelog/478.bugfix.rst b/changelog/478.bugfix.rst
deleted file mode 100644
index 1838909..0000000
--- a/changelog/478.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression with duplicated arguments via $PYTEST_ADDOPTS in 1.30.0.
diff --git a/changelog/549.feature.rst b/changelog/549.feature.rst
deleted file mode 100644
index f7eb76f..0000000
--- a/changelog/549.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make ``--pdb`` imply ``--dist no``, as the two options cannot really work together at the moment.
diff --git a/changelog/558.bugfix.rst b/changelog/558.bugfix.rst
deleted file mode 100644
index b3bb062..0000000
--- a/changelog/558.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``rsyncdirs`` usage with pytest 6.0.
diff --git a/changelog/562.bugfix.rst b/changelog/562.bugfix.rst
deleted file mode 100644
index 2c9b566..0000000
--- a/changelog/562.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Do not trigger the deprecated ``pytest_warning_captured`` in pytest 6.0+.