diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-12 12:59:20 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-12 12:59:20 -0700 |
commit | 93f38814d054fbc1fde2f2e7b59b175ed9f9fb5f (patch) | |
tree | c75d08b5ff75be27dc28bf80473c8c43189b6291 /sites | |
parent | a8b80126ecf6ee6be1a5e1ded8d1025ae2a30474 (diff) | |
parent | e5b1f0f3dc7a2cc1d2c3dfcd056c7bc184823657 (diff) |
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites')
-rw-r--r-- | sites/www/changelog.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index fdf13c3a..8665ee94 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:`2.1.3 <2017-06-09>` * :release:`2.0.6 <2017-06-09>` * :release:`1.18.3 <2017-06-09>` |