Merge pull request #357 from nicoddemus/release-1.24.0

Release 1.24.0
2018-10-29 18:23:37 -03:00
parent 3f5a8eeb7f bfd6029102
commit adc385253c
3 changed files with 15 additions and 2 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,18 @@
+pytest-xdist 1.24.0 (2018-10-18)
+================================
+
+Features
+--------
+
+- `#337 <https://github.com/pytest-dev/pytest-xdist/issues/337>`_: New ``--maxprocesses`` command-line option that limits the maximum number of workers when using ``--numprocesses=auto``.
+
+
+Bug Fixes
+---------
+
+- `#351 <https://github.com/pytest-dev/pytest-xdist/issues/351>`_: Fix scheduling deadlock in case of inter-test locking.
+
+
 pytest-xdist 1.23.2 (2018-09-28)
 ================================

--- a/changelog/337.feature.rst
+++ b/changelog/337.feature.rst
@@ -1 +0,0 @@
-New ``--maxprocesses`` command-line option that limits the maximum number of workers when using ``--numprocesses=auto``.
--- a/changelog/351.bugfix
+++ b/changelog/351.bugfix
@@ -1 +0,0 @@
-Fix scheduling deadlock in case of inter-test locking.
				`@@ -1 +0,0 @@`
				New ``--maxprocesses`` command-line option that limits the maximum number of workers when using ``--numprocesses=auto``.
				`@@ -1 +0,0 @@`
				`Fix scheduling deadlock in case of inter-test locking.`