From e3734ef33712a27b5bcceac292441add99704569 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 31 Aug 2015 21:21:29 -0300
Subject: [PATCH] Add CHANGELOG entry about renaming "warnings" to
 "pytest-warnings"

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b7092c874..fcd38e162 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -79,6 +79,11 @@
 - fix issue713: JUnit XML reports for doctest failures.
   Thanks Punyashloka Biswal.
 
+- fix issue970: internal pytest warnings now appear as "pytest-warnings" in
+  the terminal instead of "warnings", so it is clear for users that those
+  warnings are from pytest and not from the builtin "warnings" module.
+  Thanks Bruno Oliveira.
+
 - Include setup and teardown in junitxml test durations.
   Thanks Janne Vanhala.