summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-04-07 09:55:11 -0400
committerChris McDonough <chrism@plope.com>2014-04-07 09:55:11 -0400
commitbcf18220be9c21ff4b1af50f45b90aadfa7820f5 (patch)
tree99232b448c08c5689117cb84c025efb349b50b0f /CHANGES.txt
parentd7b647d27ebde9bc8203629b651e69d6e7ac7c38 (diff)
parent32200c3af84c352c066eb2c402496305375912e4 (diff)
downloadpyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.tar.gz
pyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.tar.bz2
pyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index cefb2318d..434eab898 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,15 @@
+Unreleased
+==========
+
+- Avoid crash in ``pserve --reload`` under Py3k, when iterating over posiibly
+ mutated ``sys.modules``.
+
+- Fixed a bug in ``UnencryptedCookieSessionFactoryConfig`` and
+ ``SignedCookieSessionFactory`` where ``timeout=None`` would cause a new
+ session to always be created. Also in ``SignedCookieSessionFactory`` a
+ ``reissue_time=None`` would cause an exception when modifying the session.
+ See https://github.com/Pylons/pyramid/issues/1247
+
1.5b1 (2014-02-08)
==================