summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-04-30 02:02:26 -0500
committerMichael Merickel <michael@merickel.org>2017-04-30 02:02:26 -0500
commit9c15a8eac2848cc7a81f174ecf7a6c63be323f51 (patch)
treeabf20accdb77f6127a5480bf023231c7b0b6706b /CHANGES.txt
parent3f14d63c009ae7f101b7aeb4525bab2dfe66fa11 (diff)
parent87af11c5e33b8c03d57a8b571f0b152efe866af1 (diff)
downloadpyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.tar.gz
pyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.tar.bz2
pyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.zip
Merge branch 'master' into pr/2854
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 7d70abbb8..a2e2d6db1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -32,6 +32,11 @@ Features
See https://github.com/Pylons/pyramid/pull/2854 and
https://github.com/Pylons/pyramid/pull/3019
+- The ``pyramid.config.Configurator`` can now be used as a context manager
+ which will automatically push/pop threadlocals (similar to
+ ``config.begin()`` and ``config.end()``). It will also automatically perform
+ a ``config.commit()`` and thus it is only recommended to be used at the
+ top-level of your app. See https://github.com/Pylons/pyramid/pull/2874
Bug Fixes
---------