Merge branch '1.3.x'

2016-02-25 21:26:13 -08:00
parent 8b587a87ef 4fd778fed8
commit c93ea54ea3
14 changed files with 57 additions and 50 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -3280,6 +3280,7 @@ as you want and you can also order them as usual using `@Order` or `Ordered`.
 ===


+
 [[boot-features-caching-provider-generic]]
 ==== Generic
 Generic caching is used if the context defines _at least_ one