Merge branch '2.1.x'

Closes gh-17621
2019-07-24 11:37:13 +02:00
parent fbe876d907 5a019cf14a
commit 5ed3185d04
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -105,7 +105,7 @@
    {
      "name": "logging.file.max-history",
      "type": "java.lang.Integer",
-      "description": "Maximum of archive log files to keep. Only supported with the default logback setup.",
+      "description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.",
      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
      "defaultValue": 7
    },