summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorWichert Akkerman <wichert@wiggy.net>2011-01-19 17:14:51 +0100
committerWichert Akkerman <wichert@wiggy.net>2011-01-19 17:14:51 +0100
commitcbccade72ab39d6bb3fbe87e4ef6493ec60f131a (patch)
tree0f6e5c11d38cf78d407185a1a98d5e30a84761b6 /CHANGES.txt
parent6194896e75d5d0c98fe857d754280df2ff78a4f9 (diff)
parent69869eee461afe127ff36ef6b81d518e9f9a25a0 (diff)
downloadpyramid-cbccade72ab39d6bb3fbe87e4ef6493ec60f131a.tar.gz
pyramid-cbccade72ab39d6bb3fbe87e4ef6493ec60f131a.tar.bz2
pyramid-cbccade72ab39d6bb3fbe87e4ef6493ec60f131a.zip
Merge branch 'tokens'
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