From 45c1212949e63a9976610fdf4c10962c08de3752 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Sat, 4 Aug 2012 12:42:10 -0700 Subject: [PATCH] Changelog re #36 (cherry picked from commit 5b8cdd990fea9269f8b5297ad1e3e52de08f2ee6) --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 61c4050..6bf9f21 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)