Merge branch '1.5.x'

Author: snicoll

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",

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -559,6 +559,7 @@ content into your application; rather pick only the properties that you need.
 	spring.data.cassandra.password= # Login password of the server.
 	spring.data.cassandra.read-timeout-millis= # Socket option: read time out.
 	spring.data.cassandra.reconnection-policy= # Reconnection policy class.
+	spring.data.cassandra.repositories.enabled= # Enable Cassandra repositories.
 	spring.data.cassandra.retry-policy= # Class name of the retry policy.
 	spring.data.cassandra.serial-consistency-level= # Queries serial consistency level.
 	spring.data.cassandra.schema-action=none # Schema action to take at startup.