Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Andy Wilkinson 2016-10-24 14:37:20 +01:00
commit a56bf44b39

View File

@ -3378,9 +3378,6 @@ properties:
[[boot-features-connecting-to-neo4j-embedded]] [[boot-features-connecting-to-neo4j-embedded]]
==== Using the embedded mode ==== Using the embedded mode
NOTE: Neo4j's embedded mode is subject to a different licensing, make sure to review it
before integrating the dependency in your application.
If you add `org.neo4j:neo4j-ogm-embedded-driver` to the dependencies of your application, If you add `org.neo4j:neo4j-ogm-embedded-driver` to the dependencies of your application,
Spring Boot will automatically configure an in-process embedded instance of Neo4j that Spring Boot will automatically configure an in-process embedded instance of Neo4j that
will not persist any data when your application shuts down. You can explicitly disable will not persist any data when your application shuts down. You can explicitly disable