summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorRob Miller <rob@mochimedia.com>2010-12-29 14:12:30 -0800
committerRob Miller <rob@mochimedia.com>2010-12-29 14:12:30 -0800
commit9c1d34a3de11286c98dce52592ef05a3c05046a5 (patch)
tree3b9d60fabfa876bdaba9debd477f85cd9cf926bf /CHANGES.txt
parent88231cc1b16f1f5a0983dba1dab9b401bbde0c00 (diff)
parent8739f576ed84bb48cec9c2d4b60e92878a273b1f (diff)
downloadpyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.tar.gz
pyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.tar.bz2
pyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.zip
Merge remote branch 'refs/remotes/upstream/viewderiver' into ra_view_decoration
Conflicts: CHANGES.txt pyramid/config.py
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt20
1 files changed, 19 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index c86594933..fabb882f7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,14 @@
-1.0a9 (unreleased)
+=======
+Next release
+============
+
+Bug Fixes
+---------
+
+- The ``proutes`` command tried too hard to resolve the view for printing,
+ resulting in exceptions when an exceptional root factory was encountered.
+ Instead of trying to resolve the view, if it cannot, it will now just print
+ ``<unknown>``.
Features
--------
@@ -10,6 +20,14 @@ Features
- If a handler class provides an _action_decorator classmethod, use that
as the decorator for each view registration for that handler.
+Documentation
+-------------
+
+- The (weak) "Converting a CMF Application to Pyramid" tutorial has been
+ removed from the tutorials section. It was moved to the
+ ``pyramid_tutorials`` Github repository.
+
+
1.0a8 (2010-12-27)
==================