Skip to content

S
spring-boot
Commit 56487d23 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.3.x'

parents 78f19ef8 7ba16e37
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
View file @ 56487d23
<hazelcast> <hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.5.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<map name="books"/> <map name="books"/>
<map name="players"/> <map name="players"/>
</hazelcast>
\ No newline at end of file </hazelcast>
spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml
View file @ 56487d23
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.4.xsd" <hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.5.xsd"
xmlns="http://www.hazelcast.com/schema/config" xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
<management-enabled>true</management-enabled> <management-enabled>true</management-enabled>
</cache> </cache>
</hazelcast> </hazelcast>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment