summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-12-27 01:58:59 -0600
committerMichael Merickel <michael@merickel.org>2014-12-27 01:58:59 -0600
commitd35a916095943b020f30acb90e878abe9bfd4fb1 (patch)
treebb4115edbf80254832c3498557bb7d9d92c88349
parentc569571bdb6e8c001ab0bc11777a2e0cca72d2fb (diff)
downloadpyramid-d35a916095943b020f30acb90e878abe9bfd4fb1.tar.gz
pyramid-d35a916095943b020f30acb90e878abe9bfd4fb1.tar.bz2
pyramid-d35a916095943b020f30acb90e878abe9bfd4fb1.zip
update changelog
-rw-r--r--CHANGES.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 46c331268..b60600198 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,12 @@ Next release
Features
--------
+- The ``pyramid.config.Configurator`` has grown the ability to allow
+ actions to call other actions during a commit-cycle. This enables much more
+ logic to be placed into actions, such as the ability to invoke other actions
+ or group them for improved conflict detection.
+ See https://github.com/Pylons/pyramid/pull/1513
+
- Added support / testing for 'pypy3' under Tox and Travis.
See https://github.com/Pylons/pyramid/pull/1469