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

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-04-14 13:58:03 +02:00
parent c2b2be9940 8c21e16cf1
commit 42c1eb894e
2 changed files with 10 additions and 1 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

@ -4181,6 +4181,13 @@ Infinispan has no default configuration file location so it must be specified ex
Caches can be created on startup via the `spring.cache.cache-names` property. If a custom
`ConfigurationBuilder` bean is defined, it is used to customize them.
[NOTE]
====
The support of Infinispan in Spring Boot is restricted to the embedded mode and is quite
basic. If you want more options you should use the official Infinispan Spring Boot starter
instead, check
https://github.com/infinispan/infinispan-spring-boot[the documentation] for more details.
====
[[boot-features-caching-provider-couchbase]]

4
spring-boot-samples/spring-boot-sample-cache/README.adoc
View File

@ -91,7 +91,9 @@ can set the `spring.cache.infinispan.config` property to use the provided
TIP: Run sample cache application using Infinispan with
`$mvn spring-boot:run -Pinfinispan`.
NOTE: If you want to use the client/server mode or if you need more options, Infinispan
provides an official Spring Boot starter, check
https://github.com/infinispan/infinispan-spring-boot[the documentation] for more details.
=== Couchbase
Add the `java-client` and `couchbase-spring-cache` dependencies and make sure that