summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-06-23 15:47:13 -0400
committerChris McDonough <chrism@plope.com>2011-06-23 15:47:13 -0400
commit05fd08652293809fc6fd344cd1d4fe3a90cc2201 (patch)
tree71c8e719ca4bf2861fdf2fc69207075292f8034d
parentdfd219842b7ddb68fc5ff29d2c7bd55ac56b5e29 (diff)
downloadpyramid-05fd08652293809fc6fd344cd1d4fe3a90cc2201.tar.gz
pyramid-05fd08652293809fc6fd344cd1d4fe3a90cc2201.tar.bz2
pyramid-05fd08652293809fc6fd344cd1d4fe3a90cc2201.zip
garden
-rw-r--r--CHANGES.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0bb15c35b..3c1d16fa5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,14 @@
+Next release
+============
+
+Bug fixes
+---------
+
+- Pyramid would raise an AttributeError in the Configurator when attempting
+ to set a ``__text__`` attribute on a custom predicate that was actually a
+ classmethod. See https://github.com/Pylons/pyramid/pull/217 .
+
+
1.1a2 (2011-06-22)
==================