summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-18 12:30:52 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-18 12:32:12 -0700
commitd3e2a05d5dcbec1944b6762bfec04547cb1c27e5 (patch)
tree9675ee93ed44c3359c43e15ce0db6361a16975b7
parent0e1cd71a75e0ffca549285fab9acd6f169254ffe (diff)
Fix incorrect changelog branch stuff.
Really starting to think we oughtta just move to one changelog file per major family :(
-rw-r--r--sites/www/changelog.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index daa2749e..01398a71 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -12,9 +12,10 @@ Changelog
* :bug:`1060` Fix key exchange (kex) algorithm list for GSSAPI authentication;
previously, the list used solely out-of-date algorithms, and now contains
newer ones listed preferentially before the old. Credit: Anselm Kruis.
-* :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.
+* :bug:`1055 (1.17+)` (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.0.6 <2017-06-09>`
* :release:`1.18.3 <2017-06-09>`
* :release:`1.17.5 <2017-06-09>`