diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 243d389..8c87883 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,18 @@ +pytest-xdist 1.24.0 (2018-10-18) +================================ + +Features +-------- + +- `#337 `_: New ``--maxprocesses`` command-line option that limits the maximum number of workers when using ``--numprocesses=auto``. + + +Bug Fixes +--------- + +- `#351 `_: Fix scheduling deadlock in case of inter-test locking. + + pytest-xdist 1.23.2 (2018-09-28) ================================ diff --git a/changelog/337.feature.rst b/changelog/337.feature.rst deleted file mode 100644 index da43c5b..0000000 --- a/changelog/337.feature.rst +++ /dev/null @@ -1 +0,0 @@ -New ``--maxprocesses`` command-line option that limits the maximum number of workers when using ``--numprocesses=auto``. diff --git a/changelog/351.bugfix b/changelog/351.bugfix deleted file mode 100644 index b887d1b..0000000 --- a/changelog/351.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix scheduling deadlock in case of inter-test locking.