summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2012-07-15 16:52:39 -0700
committerJeff Forcier <jeff@bitprophet.org>2012-09-23 16:46:03 -0700
commit25942dbd9021c3e8854dc7f624841dfbdf7e80f8 (patch)
tree0cd894b1786b65f50912365c1493c9b10e5abe90
parent7f3124dcd9a91b0ce886f8ee311c816f449c58b9 (diff)
downloadparamiko-25942dbd9021c3e8854dc7f624841dfbdf7e80f8.tar.gz
Attribution re: #33
(cherry picked from commit 8793771f3804b3f9bb4bf63d0b36ca105de78979)
-rw-r--r--CHANGES5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 49c3d66e..61c40504 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,11 @@ Temporary, post-Paramiko changelog while we get our sh!t together.
* #32: Raise a more useful error explaining which `known_hosts` key line was
problematic, when encountering `binascii` issues decoding known host keys.
Thanks to `@thomasvs` for catch & patch.
+* #33: Bring `ssh_config` parsing more in line with OpenSSH spec, re: order of
+ setting overrides by `Host` specifiers. Specifically, the overrides now go by
+ file order instead of automatically sorting by `Host` value length. In
+ addition, the first value found per config key (e.g. `Port`, `User` etc)
+ wins, instead of the last. Thanks to Jan Brauer for the contribution.
## ssh 1.7.14 (2012-05-07)