summaryrefslogtreecommitdiff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2018-03-09 12:26:28 -0500
committerGitHub <noreply@github.com>2018-03-09 12:26:28 -0500
commit396e5339a6d21c9ae122c7a810fdc33bf45e4a40 (patch)
treeabd46eab19f13bd402cc7f4aeedf51aa52a69b90 /CHANGES.rst
parentd3edffe1efb6126c028d2e351908daf7ad30be60 (diff)
parent7cf1a5d2ba1f963ba84b0d8196322476b0fe5ec8 (diff)
downloadpyramid-396e5339a6d21c9ae122c7a810fdc33bf45e4a40.tar.gz
pyramid-396e5339a6d21c9ae122c7a810fdc33bf45e4a40.tar.bz2
pyramid-396e5339a6d21c9ae122c7a810fdc33bf45e4a40.zip
Merge pull request #3235 from heron182/3195_cherrypy_import
Prefer standalone 'cheroot' to deprecated 'cherrypy.wsgiserver'.
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 482610319..7a8fa31f2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,6 +21,10 @@ Features
instead of ``pyramid.util.Request``.
See https://github.com/Pylons/pyramid/pull/3129
+- In ``cherrypy_server_runner``, prefer imports from the ``cheroot`` package over the legacy
+ imports from `cherrypy.wsgiserver`.
+ See https://github.com/Pylons/pyramid/pull/3235
+
Bug Fixes
---------