Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-05-04 10:42:03 +02:00
commit 81e3b392c3

View File

@ -4980,7 +4980,7 @@ to avoid having a thread blocked by an unresponsive mail server:
[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.writetimeout=5000
----