Merge branch '2.4.x'

Closes gh-26165
This commit is contained in:
Stephane Nicoll 2021-04-20 10:23:57 +02:00
commit 55b9fc12c7

View File

@ -914,7 +914,7 @@
{ {
"name": "spring.profiles.include", "name": "spring.profiles.include",
"type": "java.util.List<java.lang.String>", "type": "java.util.List<java.lang.String>",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener", "sourceType": "org.springframework.boot.context.config.Profiles",
"description": "Unconditionally activate the specified comma-separated list of profiles (or list of profiles if using YAML)." "description": "Unconditionally activate the specified comma-separated list of profiles (or list of profiles if using YAML)."
}, },
{ {