From fa43952e617ad68c52447da28fc7f5be23ff4b10 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 10 Apr 2016 22:09:29 -0500
Subject: add changelog for #2021

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4a61dbffa..2b3db8644 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -33,6 +33,13 @@ unreleased
   ``pserve development.ini LOGGING_LOGGER_ROOT_LEVEL=DEBUG``
   See https://github.com/Pylons/pyramid/pull/2399
 
+- Add a new "view deriver" concept to Pyramid to allow framework authors to
+  inject elements into the standard Pyramid view pipeline and affect all
+  views in an application. This is similar to a decorator except that it
+  has access to options passed to ``config.add_view`` and can affect other
+  stages of the pipeline such as the raw response from a view or prior to
+  security checks. See https://github.com/Pylons/pyramid/pull/2021
+
 1.6 (2015-04-14)
 ================
 
-- 
cgit v1.2.3