From b55351274ecd65689a5304619cb1c3391ed8d6da Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 6 Sep 2018 18:56:08 -0300
Subject: [PATCH] Amend CHANGELOG with missing #3251

---
 CHANGELOG.rst             | 5 ++++-
 changelog/3251.feture.rst | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 changelog/3251.feture.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7a0de069c56..fbe5dbb9922 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -63,7 +63,10 @@ Features
   more info.
 
 
-- `#3784 <https://github.com/pytest-dev/pytest/issues/3784>`_: Add option to disable plugin auto-loading.
+- `#3251 <https://github.com/pytest-dev/pytest/issues/3251>`_: Warnings are now captured and displayed during test collection.
+
+
+- `#3784 <https://github.com/pytest-dev/pytest/issues/3784>`_: ``PYTEST_DISABLE_PLUGIN_AUTOLOAD`` environment variable disables plugin auto-loading when set.
 
 
 - `#3829 <https://github.com/pytest-dev/pytest/issues/3829>`_: Added the ``count`` option to ``console_output_style`` to enable displaying the progress as a count instead of a percentage.
diff --git a/changelog/3251.feture.rst b/changelog/3251.feture.rst
deleted file mode 100644
index 3ade3093dd1..00000000000
--- a/changelog/3251.feture.rst
+++ /dev/null
@@ -1 +0,0 @@
-Warnings are now captured and displayed during test collection.