summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2012-08-04 12:42:10 -0700
committerJeff Forcier <jeff@bitprophet.org>2012-09-24 18:54:33 -0700
commit45c1212949e63a9976610fdf4c10962c08de3752 (patch)
tree87e01350e9c56405040015ae923957ab78cc49ab
parent38dec6fc5b2e2c07eec83a36f43d75d884cc6960 (diff)
downloadparamiko-45c1212949e63a9976610fdf4c10962c08de3752.tar.gz
Changelog re #36
(cherry picked from commit 5b8cdd990fea9269f8b5297ad1e3e52de08f2ee6)
-rw-r--r--CHANGES3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 61c40504..6bf9f215 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,9 @@ Temporary, post-Paramiko changelog while we get our sh!t together.
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.
+* #36: Support new server two-factor authentication option
+ (`RequiredAuthentications2`), at least re: combining key-based & password
+ auth. Thanks to Github user `bninja`.
## ssh 1.7.14 (2012-05-07)