Merge branch '2.1.x'

Closes gh-18336
2019-09-24 09:19:04 +02:00
parent d7a472b8a6 12751fe50a
commit ddc96c1a62
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -5720,7 +5720,7 @@ Those default settings can be fine-tuned using the `spring.task.execution` names

 [source,properties,indent=0]
 ----
-	spring.task.execution.pool.max-threads=16
+	spring.task.execution.pool.max-size=16
 	spring.task.execution.pool.queue-capacity=100
 	spring.task.execution.pool.keep-alive=10s
 ----