From 6ec967a3f25c2b51c8d102ca5d1b68edc7c9c17c Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@esss.com.br>
Date: Mon, 23 Jul 2018 16:20:22 -0300
Subject: [PATCH] Prepare release 1.22.3

---
 CHANGELOG.rst             | 15 +++++++++++++++
 changelog/297.trivial.rst |  1 -
 changelog/9.bugfix        |  1 -
 3 files changed, 15 insertions(+), 2 deletions(-)
 delete mode 100644 changelog/297.trivial.rst
 delete mode 100644 changelog/9.bugfix

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 76b63e2..07713e3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,18 @@
+pytest-xdist 1.22.3 (2018-07-23)
+================================
+
+Bug Fixes
+---------
+
+- Fix issue of virtualized or containerized environments not reporting the number of CPUs correctly. (`#9 <https://github.com/pytest-dev/pytest-xdist/issues/9>`_)
+
+
+Trivial Changes
+---------------
+
+- Make all classes subclass from ``object`` and fix ``super()`` call in ``LoadFileScheduling``; (`#297 <https://github.com/pytest-dev/pytest-xdist/issues/297>`_)
+
+
 pytest-xdist 1.22.2 (2018-02-26)
 ================================
 
diff --git a/changelog/297.trivial.rst b/changelog/297.trivial.rst
deleted file mode 100644
index 8c7688e..0000000
--- a/changelog/297.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make all classes subclass from ``object`` and fix ``super()`` call in ``LoadFileScheduling``;
diff --git a/changelog/9.bugfix b/changelog/9.bugfix
deleted file mode 100644
index 7952d27..0000000
--- a/changelog/9.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue of virtualized or containerized environments not reporting the number of CPUs correctly.