Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2015-10-22 17:42:22 +02:00
parent f43817dd27 7c1bf58262
commit c0b8974bc0
3 changed files with 124 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -431,6 +431,9 @@ Profile specific properties are loaded from the same locations as standard
ones irrespective of whether the profile-specific files are inside or outside your
packaged jar.
If several profiles are specified, a last wins strategy applies. For example, profiles
specified by the `spring.active.profiles` property are added after those configured via
the `SpringApplication` API and therefore take precedence.
[[boot-features-external-config-placeholders-in-properties]]