summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-02 18:11:45 -0400
committerChris McDonough <chrism@plope.com>2013-10-02 18:11:45 -0400
commit71644dbf58cdea59017328f57a6727856ba5f2c7 (patch)
tree32aeb99b4e994f51ec53d70b3166d48467fb0efc /CHANGES.txt
parentab2fedf7adaec0a56a69beed35312c88d7961c6c (diff)
parentcefcf8732b9e17bcde5b2b16fdd9c5118caa3f83 (diff)
downloadpyramid-71644dbf58cdea59017328f57a6727856ba5f2c7.tar.gz
pyramid-71644dbf58cdea59017328f57a6727856ba5f2c7.tar.bz2
pyramid-71644dbf58cdea59017328f57a6727856ba5f2c7.zip
fix merge conflict
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 67cefb79a..c8b79d65f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,12 @@ Bug Fixes
on resources. Previously it did not try to call the ``__acl__``
if it was callable.
+- The ``pviews`` script did not work when a url required custom request
+ methods in order to perform traversal. Custom methods and descriptors added
+ via ``pyramid.config.Configurator.add_request_method`` will now be present,
+ allowing traversal to continue.
+ See https://github.com/Pylons/pyramid/issues/1104
+
Documentation
-------------