From 3652e21f3b416755acdca0b7a956b0285215d303 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Wed, 5 Jul 2017 21:25:10 -0300
Subject: [PATCH] Prepare release 1.18.1

---
 CHANGELOG.rst        | 13 +++++++++++++
 changelog/171.bugfix |  1 -
 changelog/176.bugfix |  1 -
 3 files changed, 13 insertions(+), 2 deletions(-)
 delete mode 100644 changelog/171.bugfix
 delete mode 100644 changelog/176.bugfix

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a14a408..7ef3553 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,16 @@
+pytest-xdist 1.18.1 (2017-07-05)
+================================
+
+Bug Fixes
+---------
+
+- Fixed serialization of ``longrepr.sections`` during error reporting from
+  workers. (`#171 <https://github.com/pytest-dev/pytest-xdist/issues/171>`_)
+
+- Fix ``ReprLocal`` not being unserialized breaking --showlocals usages. (`#176
+  <https://github.com/pytest-dev/pytest-xdist/issues/176>`_)
+
+
 pytest-xdist 1.18.0 (2017-06-26)
 ================================
 
diff --git a/changelog/171.bugfix b/changelog/171.bugfix
deleted file mode 100644
index 648b26a..0000000
--- a/changelog/171.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed serialization of ``longrepr.sections`` during error reporting from workers.
diff --git a/changelog/176.bugfix b/changelog/176.bugfix
deleted file mode 100644
index 93d0fbe..0000000
--- a/changelog/176.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``ReprLocal`` not being unserialized breaking --showlocals usages.
\ No newline at end of file