summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-04-24 13:57:48 -0400
committerJason R. Coombs <jaraco@jaraco.com>2015-04-24 13:57:48 -0400
commit93ae9950e3e96316f0f20f27ef99fd45dae5e316 (patch)
tree9cfbaa99caca27618220ffea45128011e5d4f269
parenta4e806afe878a0f9ff2c65a4ecc579d5a993b976 (diff)
downloadcherrypy-93ae9950e3e96316f0f20f27ef99fd45dae5e316.tar.gz
Update changelog
-rw-r--r--CHANGES.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index eea7f39b..edfd63c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,14 @@
-----
+3.7.0
+-----
+
+* CherryPy daemon may now be invoked with ``python -m cherrypy`` in
+ addition to the ``cherryd`` script.
+* Issue #1298: Fix SSL handling on CPython 2.7 with builtin SSL module
+ and pyOpenSSL 0.14. This change will break PyPy for now.
+* Several documentation fixes.
+
+-----
3.6.0
-----