summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-06-06 14:27:07 -0700
committerSteve Piercy <web@stevepiercy.com>2017-06-06 14:27:07 -0700
commitd07c3a0e91a6f9d96e80c36e40470a83383a656c (patch)
treeadd70c8e878602dbeea3601f2d73041c8f68597e /CHANGES.txt
parent6b4049728eac67a948a49161f067b2420cb22603 (diff)
parentc4f00ba7a78a6d0be4538f3fce3bf01f11dcf4e8 (diff)
downloadpyramid-d07c3a0e91a6f9d96e80c36e40470a83383a656c.tar.gz
pyramid-d07c3a0e91a6f9d96e80c36e40470a83383a656c.tar.bz2
pyramid-d07c3a0e91a6f9d96e80c36e40470a83383a656c.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index fc1d5ae25..06bb71c1e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,7 +11,11 @@ unreleased
- Update RELEASING.txt for updating cookiecutters. Change cookiecutter URLs to
use shortcut.
- See: https://github.com/Pylons/pyramid/issues/3042
+ See https://github.com/Pylons/pyramid/issues/3042
+
+- Ensure the correct threadlocals are pushed during view execution when
+ invoked from ``request.invoke_exception_view``.
+ See https://github.com/Pylons/pyramid/pull/3060
1.9a2 (2017-05-09)
==================