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-01-24 13:23:06 +01:00
parent 2b75570680 5d95fb6d56
commit d67ce78e8b
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2184,7 +2184,7 @@ application starts for testing. If you want to be more sophisticated you can use
profile-specific configuration to customize `flyway.locations` so that certain migrations
will only run when a particular profile is active. For example, in
`application-dev.properties` you could set `flyway.locations` to
`classpath:/db/migration, claspath:/dev/db/migration` and migrations in `dev/db/migration`
`classpath:/db/migration, classpath:/dev/db/migration` and migrations in `dev/db/migration`
will only run when the `dev` profile is active.

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

@@ -1579,7 +1579,7 @@ it's loaded too early. You need to either use `logback-spring.xml` or define a
WARNING: The extensions cannot be used with Logback's
http://logback.qos.ch/manual/configuration.html#autoScan[configuration scanning]. If you
attempt to do so, making changes to the configuration file will result in an error similar
to once of the following being logged:
to one of the following being logged:
----
ERROR in ch.qos.logback.core.joran.spi.Interpreter@4:71 - no applicable action for [springProperty], current ElementPath is [[configuration][springProperty]]