From b3615ac29db523ae4071b7cd4b8ad35696f43b54 Mon Sep 17 00:00:00 2001
From: Omar Kohl <omarkohl@gmail.com>
Date: Tue, 19 Apr 2016 20:37:54 +0200
Subject: [PATCH] Update CHANGELOG with #607 and add version 3.0.0.dev1

---
 CHANGELOG.rst | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d95d66384ed..7488694adcd 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,24 @@
+3.0.0.dev1
+==========
+
+**Changes**
+
+*
+
+*
+
+*
+
+* Fix (`#607`_): pytest.skip() is no longer allowed at module level to
+  prevent misleading use as test function decorator. When used at a module
+  level an error will be raised during collection.
+  Thanks `@omarkohl`_ for the complete PR (`#1519`_).
+
+*
+
+.. _#607: https://github.com/pytest-dev/pytest/issues/607
+.. _#1519: https://github.com/pytest-dev/pytest/pull/1519
+
 2.10.0.dev1
 ===========