Merge branch '1.3.x'

2016-09-16 16:58:53 +02:00
parent 50c68a497b c2cdc1424b
commit b77eddb8bb
1 changed files with 3 additions and 0 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -2712,6 +2712,9 @@ DataSource configuration is controlled by external configuration properties in
 	spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 ----

+NOTE: You should at least specify the url using the `spring.datasource.url` property or
+Spring Boot will attempt to auto-configure an embedded database.
+
 TIP: You often won't need to specify the `driver-class-name` since Spring boot can deduce
 it for most databases from the `url`.