Skip to content

S
spring-boot
Commit 81e3b392 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents 832b3d1f e8f99dc0
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @ 81e3b392
...@@ -4980,7 +4980,7 @@ to avoid having a thread blocked by an unresponsive mail server: ...@@ -4980,7 +4980,7 @@ to avoid having a thread blocked by an unresponsive mail server:
[source,properties,indent=0] [source,properties,indent=0]
---- ----
spring.mail.properties.mail.smtp.connecttimeout=5000 spring.mail.properties.mail.smtp.connectiontimeout=5000
spring.mail.properties.mail.smtp.timeout=3000 spring.mail.properties.mail.smtp.timeout=3000
spring.mail.properties.mail.smtp.writetimeout=5000 spring.mail.properties.mail.smtp.writetimeout=5000
---- ----
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment