Merge branch 'master' into 2.0.x

2017-09-11 15:24:55 -06:00
parent d406ab6586 3e6fc09bba
commit 9b8fa89549
12 changed files with 245 additions and 17 deletions
--- a/docs/src/main/asciidoc/spring-cloud-config.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-config.adoc
@@ -429,6 +429,12 @@ Example:

 |*strictHostKeyChecking*
 |`true` or `false`. If false, ignore errors with host key
+
+|*knownHostsFile*
+|Location of custom .known_hosts file
+
+|*preferredAuthentications*
+|Override server authentication method order. This should allow evade login prompts if server has keyboard-interactive authentication before `publickey` method.
 |===