summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-02 16:09:57 -0400
committerChris McDonough <chrism@plope.com>2013-10-02 16:09:57 -0400
commit9c3c9a8075f250122d7827a71b6217213180fe70 (patch)
tree39ebca0f2dbdd352a1d94d17c33acbb61a02393a /CHANGES.txt
parentaf5fa07ca2fcc48ab357c0db4e1301bb960addca (diff)
parenta2d4c260952a8e2329df0c4a66d7239f2e8d0652 (diff)
downloadpyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.gz
pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.bz2
pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.zip
fix merge conflict
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt17
1 files changed, 17 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index e972c08c3..67cefb79a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,28 @@
Unreleased
==========
+Bug Fixes
+---------
+
+- Fix the ``pcreate`` script so that when the target directory name ends with a
+ slash it does not produce a non-working project directory structure.
+ Previously saying ``pcreate -s starter /foo/bar/`` produced different output
+ than saying ``pcreate -s starter /foo/bar``. The former did not work
+ properly.
+
+- Fix the ``principals_allowed_by_permission`` method of
+ ``ACLAuthorizationPolicy`` so it anticipates a callable ``__acl__``
+ on resources. Previously it did not try to call the ``__acl__``
+ if it was callable.
+
Documentation
-------------
- Added a "Quick Tutorial" to go with the Quick Tour
+- Removed mention of ``pyramid_beaker`` from docs. Beaker is no longer
+ maintained. Point people at ``pyramid_redis_sessions`` instead.
+
Backwards Incompatibilities
---------------------------