summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-25 15:20:10 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-25 15:20:10 -0700
commit5c97c4a05cbc2c3c3515aec9913622470503eee7 (patch)
tree2d3518ad0d4f5d45a9be4a1a89f71ef5cd1e066a
parent9fe9feacb85aa9cf8ad6a694b331208720723444 (diff)
parent1163fd91e31f280d7b1c4857529fe8314c61fdd5 (diff)
Merge branch '1.15' into 1.16
-rw-r--r--sites/www/changelog.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index af188663..cf75a595 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -101,8 +101,8 @@ Changelog
class. Thanks to Jared Hance for the patch.
* :support:`516 backported` Document `~paramiko.agent.AgentRequestHandler`.
Thanks to ``@toejough`` for report & suggestions.
-* :bug:`496` Fix a handful of small but critical bugs in Paramiko's GSSAPI
- support (note: this includes switching from PyCrypo's Random to
+* :bug:`496 (1.15+)` Fix a handful of small but critical bugs in Paramiko's
+ GSSAPI support (note: this includes switching from PyCrypo's Random to
`os.urandom`). Thanks to Anselm Kruis for catch & patch.
* :bug:`491` (combines :issue:`62` and :issue:`439`) Implement timeout
functionality to address hangs from dropped network connections and/or failed