summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-23 16:17:18 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-23 16:17:18 -0700
commit294bc5eb4b66f72366b275715fbf33b10ed764e6 (patch)
tree2aecacb2164b91f17c3d233059ca67b2b3dc05f1 /sites
parented3c0b8e182c188e4d70883aeefb5e4b2b8cd054 (diff)
parentf9404c52c0a5899f9b998e2b52d2316b65202414 (diff)
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 51167851..072607ee 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -152,8 +152,9 @@ Changelog
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.
+* :feature:`167` Add `~paramiko.config.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>`
* :support:`393` Replace internal use of PyCrypto's ``SHA.new`` with the
stdlib's ``hashlib.sha1``. Thanks to Alex Gaynor.