Merge branch '1.5.x'

2017-01-06 10:13:20 +01:00
parent 53accf920f 7a75fb0f38
commit dbb9a1bd20
3 changed files with 7 additions and 6 deletions
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -1173,5 +1173,6 @@ content into your application; rather pick only the properties that you need.
 	# ----------------------------------------

 	spring.test.database.replace=any # Type of existing DataSource to replace.
+	spring.test.mockmvc.print=default # MVC Print option.

 ----