summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-02 21:31:05 -0400
committerChris McDonough <chrism@plope.com>2012-11-02 21:31:05 -0400
commit926fb68c194bb65b7fec059015260b418d4ca83d (patch)
tree03668eaa29ee42f188077c4aed94b646006b8a22 /CHANGES.txt
parent2c3e04fda933f5faf3f365b22cda8accf79841de (diff)
parent6e96403bbc3069ec876690be976121b759c51cb1 (diff)
downloadpyramid-926fb68c194bb65b7fec059015260b418d4ca83d.tar.gz
pyramid-926fb68c194bb65b7fec059015260b418d4ca83d.tar.bz2
pyramid-926fb68c194bb65b7fec059015260b418d4ca83d.zip
resolve merge conflict
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 80d4a5dee..563851e74 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,11 @@ Features
- Slightly better debug logging from RepozeWho1AuthenticationPolicy.
+- ``pyramid.security.view_execution_permitted`` used to return `True` if no
+ view could be found. It now raises a ``TypeError`` exception in that case, as
+ it doesn't make sense to assert that a nonexistent view is
+ execution-permitted. See https://github.com/Pylons/pyramid/issues/299.
+
1.4a3 (2012-10-26)
==================