summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-06-21 13:29:42 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-06-21 13:29:42 -0700
commit93e0b8345422501de666896690516b755357b6b7 (patch)
treee693ac28eaaa203a071ad885f710c7bf7497dfd0
parent52376f2fce4dff1b6c79ff03233c3ca1cdffc46e (diff)
parent49e3f1a58bec2b9443566f4b5104f2c363d9f872 (diff)
Merge branch '1.17' into 2.0
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 913ecf47..b8a3a957 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :release:`1.17.1 <2016-06-21>`
+* :release:`1.16.2 <2016-06-21>`
* :bug:`520 (1.16+)` (Partial fix) Fix at least one instance of race condition
driven threading hangs at end of the Python interpreter session. (Includes a
docs update as well - always make sure to ``.close()`` your clients!)