Commit feb1ab37 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.4.x' into 1.5.x

parents 544c7384 095eb779
...@@ -88,6 +88,12 @@ ...@@ -88,6 +88,12 @@
"name": "spring.data.couchbase.consistency", "name": "spring.data.couchbase.consistency",
"defaultValue": "read-your-own-writes" "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", "name": "spring.data.couchbase.repositories.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
......
...@@ -560,6 +560,7 @@ content into your application; rather pick only the properties that you need. ...@@ -560,6 +560,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.password= # Login password of the server.
spring.data.cassandra.read-timeout-millis= # Socket option: read time out. spring.data.cassandra.read-timeout-millis= # Socket option: read time out.
spring.data.cassandra.reconnection-policy= # Reconnection policy class. 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.retry-policy= # Class name of the retry policy.
spring.data.cassandra.serial-consistency-level= # Queries serial consistency level. spring.data.cassandra.serial-consistency-level= # Queries serial consistency level.
spring.data.cassandra.schema-action=none # Schema action to take at startup. spring.data.cassandra.schema-action=none # Schema action to take at startup.
......
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