Merge pull request #318 from nicoddemus/release-1.22.4

Release 1.22.4

CHANGELOG.rst

@@ -1,3 +1,16 @@
+pytest-xdist 1.22.4 (2018-07-27)
+================================
+
+Bug Fixes
+---------
+
+- `#305 <https://github.com/pytest-dev/pytest-xdist/issues/305>`_: Remove last references to obsolete ``py.code``.
+
+  Remove some unnecessary references to ``py.builtin``.
+
+- `#316 <https://github.com/pytest-dev/pytest-xdist/issues/316>`_: Workaround cpu detection on Travis CI.
+
+
 pytest-xdist 1.22.3 (2018-07-23)
 ================================
 

changelog/305.bugfix.rst

@@ -1,3 +0,0 @@
-Remove last references to obsolete ``py.code``.
-
-Remove some unnecessary references to ``py.builtin``.

changelog/316.bugfix

@@ -1 +0,0 @@
-Workaround cpu detection on Travis CI

changelog/_template.rst

@@ -13,8 +13,7 @@
 
 {% if definitions[category]['showcontent'] %}
 {% for text, values in sections[section][category]|dictsort(by='value') %}
-- {{ text }}{% if category != 'vendor' %} (`{{ values[0] }} <https://github.com/pytest-dev/pytest-xdist/issues/{{ values[0][1:] }}>`_){% endif %}
+- `{{ values[0] }} <https://github.com/pytest-dev/pytest-xdist/issues/{{ values[0][1:] }}>`_: {{ text }}
-
 
 {% endfor %}
 {% else %}