Merge branch '1.2.x'

2015-03-30 17:01:08 -07:00
parent fbf34e261e 495a79c324
commit 5d9efe40d0
4 changed files with 144 additions and 31 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -869,6 +869,10 @@ relative to the current directory.
 Log files will rotate when they reach 10 Mb and as with console output, `ERROR`, `WARN`
 and `INFO` level messages are logged by default.

+NOTE: The logging system is initialized early in the application lifecycle and as such
+logging properties will not be found in property files loaded via `@PropertySource`
+annotations.
+


 [[boot-features-custom-log-levels]]