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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2017-03-15 08:57:42 +01:00
parent b76ca0bf8f cd8684499d
commit 1b395ddd9d
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc
View File

@@ -217,7 +217,7 @@ NOTE: `PropertiesLauncher` supports loading properties from
|`loader.home`
|Used to resolve relative paths in `loader.path`. E.g. `loader.path=lib` then
`${loader.home}/lib` is a classpath location (along with all jar files in that
directory). Also used to locate a `loader.properties file`. Example `file:///opt/app`
directory). Also used to locate a `loader.properties` file. Example `file:///opt/app`
(defaults to `${user.dir}`).
|`loader.args`

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

@@ -565,8 +565,8 @@ specified by the `spring.profiles.active` property are added after those configu
the `SpringApplication` API and therefore take precedence.
NOTE: If you have specified any files in `spring.config.location`, profile-specific
variants of those files will not be considered. Use directories in`spring.config.location`
if you also want to also use profile-specific properties.
variants of those files will not be considered. Use directories in
`spring.config.location` if you also want to also use profile-specific properties.
@@ -4117,7 +4117,7 @@ NOTE: Since a cache library may offer both a native implementation and JSR-107 s
Spring Boot will prefer the JSR-107 support so that the same features are available if
you switch to a different JSR-107 implementation.
TIP: Spring Boot has a <<boot-features-hazelcast,general support for Hazelcast>>t. If
TIP: Spring Boot has a <<boot-features-hazelcast,general support for Hazelcast>>. If
a single `HazelcastInstance` is available, it is automatically reused for the
`CacheManager` as well unless the `spring.cache.jcache.config` property is specified.