Skip to content

S
spring-boot
Commit 55b9fc12 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.4.x' 

Closes gh-26165
parents cf5334da 52543b84
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file @ 55b9fc12
...@@ -914,7 +914,7 @@ ...@@ -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)."
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment