From 6b0a8c633b082430c888a94a0411d52b506bea4e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 28 Jul 2017 07:31:27 -0300
Subject: [PATCH 1/2] Fix changelog grammar

---
 changelog/175.bugfix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/175.bugfix b/changelog/175.bugfix
index 3544081..d33f71e 100644
--- a/changelog/175.bugfix
+++ b/changelog/175.bugfix
@@ -1,2 +1,2 @@
-Fix error internal error handling during event loop in the master node. This bug would shadow the original errors
+Fix bug in internal event-loop error handler in the master node. This bug would shadow the original errors
 making extremely hard/impossible for users to diagnose the problem properly.

From f27265cd28f9ad301fe29545118afefbd5410124 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 28 Jul 2017 07:31:45 -0300
Subject: [PATCH 2/2] Prepare CHANGELOG for 1.18.2

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7ef3553..14cee38 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,18 @@
+pytest-xdist 1.18.2 (2017-07-28)
+================================
+
+Bug Fixes
+---------
+
+- Removal of unnecessary dependency on incorrect version of py. (`#105
+  <https://github.com/pytest-dev/pytest-xdist/issues/105>`_)
+
+- Fix bug in internal event-loop error handler in the master node. This bug
+  would shadow the original errors making extremely hard/impossible for users
+  to diagnose the problem properly. (`#175 <https://github.com/pytest-
+  dev/pytest-xdist/issues/175>`_)
+
+
 pytest-xdist 1.18.1 (2017-07-05)
 ================================
 
diff --git a/changelog/105.bugfix b/changelog/105.bugfix
deleted file mode 100644
index f54767a..0000000
--- a/changelog/105.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Removal of unnecessary dependency on incorrect version of py.
diff --git a/changelog/175.bugfix b/changelog/175.bugfix
deleted file mode 100644
index d33f71e..0000000
--- a/changelog/175.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix bug in internal event-loop error handler in the master node. This bug would shadow the original errors
-making extremely hard/impossible for users to diagnose the problem properly.