summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-11-07 09:34:21 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-11-07 09:34:21 -0800
commitd4767b09b3571d5b4cecd3a788dcaeaa5895e258 (patch)
treeddd9db07045e7ea7fa1500a3a31b23067614f1fe /sites
parent4370b106a985e9eb41966d01acc0043ed7caddad (diff)
parent11e46d109a19b2dc557ed2e31e3f3f8a16c726a9 (diff)
Merge branch '2.2' into 2.3
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 2016d872..2a54714a 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :bug:`1108 (1.17+)` Rename a private method keyword argument (which was named
+ ``async``) so that we're compatible with the upcoming Python 3.7 release
+ (where ``async`` is a new keyword.) Thanks to ``@vEpiphyte`` for the report.
* :support:`- backported` Include LICENSE file in wheel archives.
* :release:`2.3.1 <2017-09-22>`
* :bug:`1071` Certificate support broke the no-certificate case for Ed25519