Merge pull request #170 from nicoddemus/release-1.18.0

release 1.18.0
2017-06-26 21:28:30 -03:00
parent 6e1154881d cee78e9b20
commit 665b8eda8d
3 changed files with 15 additions and 2 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,18 @@
+pytest-xdist 1.18.0 (2017-06-26)
+================================
+
+Features
+--------
+
+- Add long option `--numprocesses` as alternative for `-n`. (#168)
+
+
+Bug Fixes
+---------
+
+- Fix serialization and deserialization dropping longrepr details. (#133)
+
+
 pytest-xdist 1.17.1 (2017-06-10)
 ================================

--- a/changelog/133.bugfix
+++ b/changelog/133.bugfix
@@ -1 +0,0 @@
-Fix serialization and deserialization dropping longrepr details. 
--- a/changelog/168.feature
+++ b/changelog/168.feature
@@ -1 +0,0 @@
-Add long option `--numprocesses` as alternative for `-n`.
				`@@ -1 +0,0 @@`
				`Fix serialization and deserialization dropping longrepr details.`
				`@@ -1 +0,0 @@`
				Add long option `--numprocesses` as alternative for `-n`.