summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-02-20 21:24:59 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-02-20 21:24:59 -0800
commit12ef90ee3d423460f72c754aff14996075ab6006 (patch)
treeac375fe1034b843a6a53731ce79cf1de51f2d1f2 /sites/www/changelog.rst
parentf1ce6e2c9e0a3c23b142cdf0456b87e3a7383a7b (diff)
parentf1985e632862689502d8757e61a0e51bbbb6dee9 (diff)
Merge branch '2.1'
Diffstat (limited to 'sites/www/changelog.rst')
-rw-r--r--sites/www/changelog.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 1f7fa62c..2704bf3d 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
Changelog
=========
+* :release:`2.1.2 <2017-02-20>`
+* :release:`2.0.5 <2017-02-20>`
+* :release:`1.18.2 <2017-02-20>`
+* :release:`1.17.4 <2017-02-20>`
* :bug:`853 (1.17+)` Tweak how `RSAKey.__str__ <paramiko.rsakey.RSAKey>`
behaves so it doesn't cause ``TypeError`` under Python 3. Thanks to Francisco
Couzo for the report.