Merge branch '1.4.x' into 1.5.x

2017-03-10 09:36:55 +01:00
parent 544c73841d 095eb779e2
commit feb1ab375f
2 changed files with 7 additions and 0 deletions
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -88,6 +88,12 @@
    "name": "spring.data.couchbase.consistency",
    "defaultValue": "read-your-own-writes"
  },
+  {
+    "name": "spring.data.cassandra.repositories.enabled",
+    "type": "java.lang.Boolean",
+    "description": "Enable Cassandra repositories.",
+    "defaultValue": true
+  },
  {
    "name": "spring.data.couchbase.repositories.enabled",
    "type": "java.lang.Boolean",