summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-16 09:20:43 +0200
committerChris McDonough <chrism@plope.com>2013-08-16 09:20:43 +0200
commitbedddda9e128bd4497ddfa1122ea06288ee1c58f (patch)
tree4059af6880d0f7f50b68b7407b0381262eb4ace7 /CHANGES.txt
parent5aab1e9c2aebbbb0e955a34067db9a196d430a0c (diff)
parentedfc4f80a1240f6f5f0c41e53078a8f5d305075f (diff)
downloadpyramid-bedddda9e128bd4497ddfa1122ea06288ee1c58f.tar.gz
pyramid-bedddda9e128bd4497ddfa1122ea06288ee1c58f.tar.bz2
pyramid-bedddda9e128bd4497ddfa1122ea06288ee1c58f.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 679f8ed4a..48efad6d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -51,11 +51,13 @@ Features
- The ``AuthTktAuthenticationPolicy`` has two new options to configure its
domain usage:
+
* ``parent_domain``: if set the authentication cookie is set on
the parent domain. This is useful if you have multiple sites sharing the
same domain.
* ``domain``: if provided the cookie is always set for this domain, bypassing
- all usual logic.
+ all usual logic.
+
See https://github.com/Pylons/pyramid/pull/1028,
https://github.com/Pylons/pyramid/pull/1072 and
https://github.com/Pylons/pyramid/pull/1078.