summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-03 23:08:42 -0400
committerChris McDonough <chrism@plope.com>2011-09-03 23:08:42 -0400
commit061154d55814c29598b80510a932396305a425a9 (patch)
treed1b7a4d59cb012c12f70052705d626e5275d43e6
parent54190dd68e0307cae3d21e5f8920e9a5ea379771 (diff)
downloadpyramid-061154d55814c29598b80510a932396305a425a9.tar.gz
pyramid-061154d55814c29598b80510a932396305a425a9.tar.bz2
pyramid-061154d55814c29598b80510a932396305a425a9.zip
add a changelog entry for work done on this branch
-rw-r--r--CHANGES.txt5
-rw-r--r--docs/whatsnew-1.2.rst2
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 9f2dc67ef..b06a972ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,11 @@ Bug Fixes
when registering routes in certain circumstances. See
https://github.com/Pylons/pyramid/issues/260
+Dependencies
+------------
+
+- The ``zope.configuration`` package is no longer a dependency.
+
1.2a4 (2011-09-02)
==================
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index bebc1e0be..ba92e3542 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -277,3 +277,5 @@ Dependency Changes
- Pyramid now requires Venusian 1.0a1 or better to support the ``onerror``
keyword argument to :meth:`pyramid.config.Configurator.scan`.
+
+- The ``zope.configuration`` package is no longer a dependency.