Merge branch 'feature.subrequest'

1 files changed, 12 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 6c210600c..66ac42136 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -163,6 +163,9 @@ Features
 - Added the ``pyramid.testing.testConfig`` context manager, which can be used
   to generate a configurator in a test, e.g. ``with testing.testConfig(...):``.
 
+- Users can now invoke a subrequest from within view code using a new
+  ``request.invoke_subrequest`` API.
+
 Deprecations
 ------------
 
@@ -249,6 +252,12 @@ Backwards Incompatibilities
   * ``registerSettings``, use 
     ``pyramid.config.Configurator.add_settings`` instead.
 
+- In Pyramid 1.3 and previous, the ``__call__`` method of a Response object
+  was invoked before any finished callbacks were executed.  As of this
+  release, the ``__call__`` method of a Response object is invoked *after*
+  finished callbacks are executed.  This is in support of the
+  ``request.invoke_subrequest`` feature.
+
 Documentation
 -------------
 
@@ -257,6 +266,9 @@ Documentation
   how to show Pyramid-generated deprecation warnings while running tests and
   while running a server.
 
+- Added a "Invoking a Subrequest" chapter to the documentation.  It describes
+  how to use the new ``request.invoke_subrequest`` API.
+
 Dependencies
 ------------