summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-19 11:29:55 -0500
committerChris McDonough <chrism@plope.com>2011-01-19 11:29:55 -0500
commitc46e56aa879823eb061a787356cff50a01218c5d (patch)
treef6f3ae798dee58961deeceff3331a8ba86b33f99 /CHANGES.txt
parent6194896e75d5d0c98fe857d754280df2ff78a4f9 (diff)
parente4e97b22f60df2e73c91cf3eb16c53bb2b468515 (diff)
downloadpyramid-c46e56aa879823eb061a787356cff50a01218c5d.tar.gz
pyramid-c46e56aa879823eb061a787356cff50a01218c5d.tar.bz2
pyramid-c46e56aa879823eb061a787356cff50a01218c5d.zip
Merge branch 'wichert-master'
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 11bcaadb5..7bd878fca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -299,6 +299,9 @@ Bug Fixes
Features
--------
+- When using the auth_tkt authentication plugin accept a ``tokens`` parameter
+ in :py:func:`pyramid.security.remember`.
+
- If a resource implements a ``__resource_url__`` method, it will be called
as the result of invoking the ``pyramid.url.resource_url`` function to
generate a URL, overriding the default logic. See the new "Generating The