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

Merge branch '1.1.x'

This commit is contained in:
Stephane Nicoll 2014-09-03 16:32:24 +02:00
parent 236026a43a 811f5ab80c
commit 383288f1c2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -32,7 +32,7 @@ content into your application; rather pick only the properties that you need.
spring.config.location= # location of config file spring.config.location= # location of config file
# PROFILES # PROFILES
spring.profiles= # comma list of active profiles spring.profiles.active= # comma list of <<howto-set-active-spring-profiles,active profiles>>
# APPLICATION SETTINGS ({sc-spring-boot}/SpringApplication.{sc-ext}[SpringApplication]) # APPLICATION SETTINGS ({sc-spring-boot}/SpringApplication.{sc-ext}[SpringApplication])
spring.main.sources= spring.main.sources=

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

@ -453,6 +453,9 @@ by using a `spring.profiles` key to indicate when the document applies. For exam
address: 192.168.1.120 address: 192.168.1.120
---- ----
In the example above, the `server.address` property will be `127.0.0.1` if the `development`
profile is active. If the `development` and `production` profiles are **not** enabled, then the
value for the property will be `192.168.1.100`
[[boot-features-external-config-yaml-shortcomings]] [[boot-features-external-config-yaml-shortcomings]]
@ -638,6 +641,9 @@ For example, when an application with following properties is run using the swit
spring.profiles.include: proddb,prodmq spring.profiles.include: proddb,prodmq
---- ----
NOTE: Remember that the `spring.profiles` property can be defined in a YAML document
to determine when this particular document is included in the configuration. See
<<howto-change-configuration-depending-on-the-environment>> for more details.
[[boot-features-programmatically-setting-profiles]] [[boot-features-programmatically-setting-profiles]]