From ce603dc0ea4783026d62d42fb2315f40d8781fe0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 25 Jun 2016 14:18:41 +0200
Subject: [PATCH] Add changelog entry for #1564

---
 CHANGELOG.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 427be0910..662f0a50c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -38,7 +38,8 @@
 
 *
 
-*
+* ImportErrors in plugins now are a fatal error instead of issuing a
+  pytest warning (`#1479`_). Thanks to `@The-Compiler`_ for the PR.
 
 .. _#1580: https://github.com/pytest-dev/pytest/pull/1580
 .. _#1605: https://github.com/pytest-dev/pytest/issues/1605
@@ -47,6 +48,7 @@
 .. _#1553: https://github.com/pytest-dev/pytest/issues/1553
 .. _#1626: https://github.com/pytest-dev/pytest/pull/1626
 .. _#1503: https://github.com/pytest-dev/pytest/issues/1503
+.. _#1479: https://github.com/pytest-dev/pytest/issues/1479
 
 .. _@graingert: https://github.com/graingert
 .. _@taschini: https://github.com/taschini