root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into 2.5.x 

Closes gh-28466
This commit is contained in:
Stephane Nicoll 2021-10-28 11:53:19 +02:00
parent 37d96a94bf e4c96b3684
commit ce38d592f9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/logging.adoc
View File

@ -182,7 +182,7 @@ The following rotation policy properties are supported:
| The maximum amount of size log archives can take before being deleted. | The maximum amount of size log archives can take before being deleted.
| configprop:logging.logback.rollingpolicy.max-history[] | configprop:logging.logback.rollingpolicy.max-history[]
| The number of days to keep log archives (defaults to 7) | The maximum number of archive log files to keep (defaults to 7).
|=== |===

4
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -156,7 +156,7 @@
{ {
"name": "logging.file.max-history", "name": "logging.file.max-history",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.", "description": "Maximum number of archive log files to keep. Only supported with the default logback setup.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": 7, "defaultValue": 7,
"deprecation": { "deprecation": {
@ -194,7 +194,7 @@
{ {
"name": "logging.logback.rollingpolicy.max-history", "name": "logging.logback.rollingpolicy.max-history",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Maximum number of days archive log files are kept.", "description": "Maximum number of archive log files to keep.",
"sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
"defaultValue": 7 "defaultValue": 7
}, },