summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-22 11:33:31 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-22 11:33:31 -0700
commit1af8db2331ec9d5f729ff62d8af87b9d8c1c7fb8 (patch)
tree86d018453a45586d447b8e55c8b5878e75eec03a /sites/www
parent84995f99a9528b84bd1666060c832ca673641a53 (diff)
parentaf9f16f9a03bede1c5af84d00bc73097f6b45b54 (diff)
Merge branch '1.15'
Conflicts: sites/www/changelog.rst
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 49067855..374e04b3 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,11 @@
Changelog
=========
+* :release:`1.15.1 <2014-09-22>`
+* :bug:`399` SSH agent forwarding (potentially other functionality as
+ well) would hang due to incorrect values passed into the new window size
+ arguments for `.Transport` (thanks to a botched merge). This has been
+ corrected. Thanks to Dylan Thacker-Smith for the report & patch.
* :feature:`167` Add `.SSHConfig.get_hostnames` for easier introspection of a
loaded SSH config file or object. Courtesy of Søren Løvborg.
* :release:`1.15.0 <2014-09-18>`