summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-12 12:56:43 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-12 12:56:43 -0700
commit5622f731f899769c4cde243c991a6c04af76770b (patch)
tree7b32cb9817badd919c7029c7bb451c5c0043e320
parent887282171891146c6d4ff0a4151bc316c24e85b6 (diff)
parentdd7bc78eaadd76c6991e276387e4c2675a766120 (diff)
downloadparamiko-5622f731f899769c4cde243c991a6c04af76770b.tar.gz
Merge branch '1.17' into 1.18
-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 15eaaab9..ea38ec2b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :bug:`1055` (also :issue:`1056`, :issue:`1057`, :issue:`1058`, :issue:`1059`)
+ Fix up host-key checking in our GSSAPI support, which was previously using an
+ incorrect API call. Thanks to Anselm Kruis for the patches.
* :release:`1.18.3 <2017-06-09>`
* :release:`1.17.5 <2017-06-09>`
* :support:`906 (1.18+)` Clean up a handful of outdated imports and related