Merge branch '2.4.x'

Closes gh-26654
pull/26659/head
Stephane Nicoll 4 years ago
commit d5b41e288f

@ -911,6 +911,12 @@
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener", "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Comma-separated list of active profiles. Can be overridden by a command line switch." "description": "Comma-separated list of active profiles. Can be overridden by a command line switch."
}, },
{
"name": "spring.profiles.default",
"type": "java.lang.String",
"description": "Name of the profile to enable if no profile is active.",
"defaultValue": "default"
},
{ {
"name": "spring.profiles.include", "name": "spring.profiles.include",
"type": "java.util.List<java.lang.String>", "type": "java.util.List<java.lang.String>",

Loading…
Cancel
Save