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
commit11e46d109a19b2dc557ed2e31e3f3f8a16c726a9 (patch)
tree50423ee18c75ab4caf9c437d67b4446293030ae6 /sites
parent71608fd6615ab88ab9ca5b3a8ad1e89a342afd58 (diff)
parenta838d0e87afc094499705c4fe9623befcce2e822 (diff)
Merge branch '2.1' into 2.2
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 fe08b9dd..cf77a812 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.2.2 <2017-09-18>`
* :release:`2.1.4 <2017-09-18>`