From 6a96b464abf6b3c808f918e6c5cc9c795d2416c8 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Fri, 20 Jan 2017 15:26:59 +0100
Subject: [PATCH] update changelog as suggested

---
 CHANGELOG.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ff6efb7ef..fae302fd3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,10 +1,11 @@
 3.0.6.dev0
 ==========
 
-* fix issue #2118 - protect against internal deprecationerrors by changing the code path of Node._getcustomclass.
-  This also turns a internal deprecation into a real deprecation.
+* pytest no longer generates ``PendingDeprecationWarning`` from its own operations, which was introduced by mistake in version ``3.0.5`` (`#2118`_).
   Thanks to `@nicoddemus`_ for the report and `@RonnyPfannschmidt`_ for the PR.
 
+
+
 *
 
 *
@@ -14,6 +15,7 @@
 *
 
 
+.. _#2118: https://github.com/pytest-dev/pytest/issues/2118
 
 3.0.5
 =====