root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #5780 from dustinschultz/master 

* pr/5780:
  Update docs with Servlet property load ordering
This commit is contained in:
Phillip Webb 2016-04-25 14:21:26 -07:00
parent cf28f55e98 a3469c5e26
commit dee8a20e6f
1 changed files with 2 additions and 0 deletions
Show Stats 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

@ -333,6 +333,8 @@ sensible overriding of values, properties are considered in the following order:
. Command line arguments.
. Properties from `SPRING_APPLICATION_JSON` (inline JSON embedded in an environment variable or system property)
. `ServletConfig` init parameters.
. `ServletContext` init parameters.
. JNDI attributes from `java:comp/env`.
. Java System properties (`System.getProperties()`).
. OS environment variables.