summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorKarl O. Pinc <kop@meme.com>2013-10-02 15:07:20 -0500
committerKarl O. Pinc <kop@meme.com>2013-10-02 15:07:20 -0500
commit1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b (patch)
treed02e465bf1402b571071a1f29a1a5b39aa6ebad8 /CHANGES.txt
parent68d16988404aec339fde1df7822c783d3ea23af6 (diff)
parent678f49d2e08b128785e32ed6fc9e12df4713ad7c (diff)
downloadpyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.tar.gz
pyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.tar.bz2
pyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.zip
Merge remote-tracking branch 'upstream/master' into doc_render
Doing something to make the pull request have the right stuff.
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8b2210a99..880f7a3f3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,20 @@
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
-------------