diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-11-12 13:57:16 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-11-12 13:57:16 -0800 |
commit | 14fdeae3b0f5c250fa2aac1ba729e0c6749a2be5 (patch) | |
tree | db317dd27f4f5a2322e07bd87167249d009df730 /sites/www | |
parent | 7ebbabef50bd8b75d9865e76a9534fc7e47273d4 (diff) | |
parent | e57e4ba1c44b05d0d4ce5f50be4b8676d9df79ed (diff) |
Merge branch '1.14' into 1.15
Conflicts:
tests/test_util.py
Diffstat (limited to 'sites/www')
-rw-r--r-- | sites/www/changelog.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index b954a230..d26250a0 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :bug:`429` Server-level debug message logging was overlooked during the + Python 3 compatibility update; Python 3 clients attempting to log SSH debug + packets encountered type errors. This is now fixed. Thanks to ``@mjmaenpaa`` + for the catch. * :bug:`320` Update our win_pageant module to be Python 3 compatible. Thanks to ``@sherbang`` and ``@adamkerz`` for the patches. * :release:`1.15.1 <2014-09-22>` |