Merge branch '2.5.x'

Closes gh-27370
pull/27405/head
Andy Wilkinson 3 years ago
commit 3d581847e6

@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.schema-action=create-if-not-exists",
"spring.data.cassandra.connection.connect-timeout=20s",
"spring.data.cassandra.connection.init-query-timeout=2s", "spring.data.cassandra.request.timeout=10s" })
"spring.data.cassandra.connection.init-query-timeout=10s", "spring.data.cassandra.request.timeout=10s" })
@Testcontainers(disabledWithoutDocker = true)
class DataCassandraTestIntegrationTests {

@ -47,7 +47,8 @@ import static org.assertj.core.api.Assertions.assertThat;
properties = { "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.schema-action=create-if-not-exists",
"spring.data.cassandra.connection.connect-timeout=20s",
"spring.data.cassandra.connection.init-query-timeout=2s", "spring.data.cassandra.request.timeout=10s" })
"spring.data.cassandra.connection.init-query-timeout=10s",
"spring.data.cassandra.request.timeout=10s" })
@Testcontainers(disabledWithoutDocker = true)
class DataCassandraTestWithIncludeFilterIntegrationTests {

Loading…
Cancel
Save