root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2016-09-27 10:14:57 +02:00
parent 1942cd1e81 9210bf0822
commit ea9faa5f6a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3925,8 +3925,9 @@ Caches can be created on startup via the `spring.cache.cache-names` property. If
[[boot-features-caching-provider-couchbase]] [[boot-features-caching-provider-couchbase]]
==== Couchbase ==== Couchbase
If Couchbase is available and <<boot-features-couchbase,configured>>, a If the Couchbase java client and the `couchbase-spring-cache` implementation are
`CouchbaseCacheManager` is auto-configured. It is also possible to create additional available and Couchbase is <<boot-features-couchbase,configured>>, a
`CouchbaseCacheManager` will be auto-configured. It is also possible to create additional
caches on startup using the `spring.cache.cache-names` property. These will operate on caches on startup using the `spring.cache.cache-names` property. These will operate on
the `Bucket` that was auto-configured. You can _also_ create additional caches on another the `Bucket` that was auto-configured. You can _also_ create additional caches on another
`Bucket` using the customizer: assume you need two caches on the "main" `Bucket` (`foo` `Bucket` using the customizer: assume you need two caches on the "main" `Bucket` (`foo`
@ -5050,7 +5051,7 @@ configure elements of the auto-configuration you can use the `@AutoConfigureJson
annotation. annotation.
Spring Boot includes AssertJ based helpers that work with the JSONassert and JsonPath Spring Boot includes AssertJ based helpers that work with the JSONassert and JsonPath
libraries to check that JSON is as expected. The `JacksonHelper`, `GsonHelper` and libraries to check that JSON is as expected. The `JacksonTester`, `GsonTester` and
`BasicJsonTester` classes can be used for Jackson, Gson and Strings respectively. Any `BasicJsonTester` classes can be used for Jackson, Gson and Strings respectively. Any
helper fields on the test class can be `@Autowired` when using `@JsonTest`. helper fields on the test class can be `@Autowired` when using `@JsonTest`.

0
spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/src/main/java/org/springframework/boot/devtools/Restarter.java → spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
View File