summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSviatoslav Sydorenko <wk@sydorenko.org.ua>2019-06-23 17:06:04 +0200
committerSviatoslav Sydorenko <wk@sydorenko.org.ua>2019-06-23 17:06:04 +0200
commit18a712eff9c7087c6bcaed86d927e4e30a101338 (patch)
treee8e70f4f98e41823774445c983d1cb7722e6f9fc
parent1ab46e5fa2c054a6a8accfa6002a1791c5aa0b31 (diff)
parentd241026c1333b690bdba595bd69d5fa0cc4b3fa1 (diff)
downloadcherrypy-git-18.1.2.tar.gz
Merge branch 'maint/17.x'v18.1.2
-rw-r--r--CHANGES.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 0741068e..6d5ef162 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -32,6 +32,11 @@ v18.0.0
remain an LTS release for bug and security fixes.
* Drop support for Python 3.4.
+v17.4.2 (unreleased)
+--------------------
+
+* Fixed :issue:`1377` by backporting :pr:`1785` via :pr:`1786`:
+ Restore a native WSGI-less HTTP server support.
v17.4.1
-------