summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-07 00:08:59 -0400
committerChris McDonough <chrism@plope.com>2012-08-07 00:08:59 -0400
commit735abf49f936cedc845907516a3922cdffa83665 (patch)
tree11787501669cee587f8b0a7c33024fb62d397e81
parentd986123332806aadc43b1daab396ff5200ec10ce (diff)
downloadpyramid-735abf49f936cedc845907516a3922cdffa83665.tar.gz
pyramid-735abf49f936cedc845907516a3922cdffa83665.tar.bz2
pyramid-735abf49f936cedc845907516a3922cdffa83665.zip
note conflict behavior change
-rw-r--r--CHANGES.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index ecffea5d9..e092b1545 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -41,6 +41,12 @@ Features
See "Adding A Third Party View or Route Predicate" in the Hooks chapter for
more information.
+ Note that changes made to support the above feature now means that only
+ actions registered using the same "order" can conflict with one another.
+ It used to be the case that actions registered at different orders could
+ potentially conflict, but to my knowledge nothing ever depended on this
+ behavior (it was a bit silly).
+
- Custom objects can be made easily JSON-serializable in Pyramid by defining
a ``__json__`` method on the object's class. This method should return
values natively serializable by ``json.dumps`` (such as ints, lists,