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

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2014-10-13 15:36:14 +01:00
parent 4b9f14f55b 7060cc1967
commit 2da4dc00f0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,9 +203,9 @@ Spring Boot uses a very particular `PropertySource` order that is designed to al
sensible overriding of values, properties are considered in the the following order:
. Command line arguments.
. JNDI attributes from `java:comp/env`.
. Java System properties (`System.getProperties()`).
. OS environment variables.
. JNDI attributes from `java:comp/env`
. A `RandomValuePropertySource` that only has properties in `+random.*+`.
. Application properties outside of your packaged jar (`application.properties`
including YAML and profile variants).