Merge branch '1.3.x'

d66bc7b1 · Andy Wilkinson · 2c8d4421 · d3074a08 · d66bc7b1
Commit d66bc7b1 authored Feb 18, 2016 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

SampleCassandraApplicationTests.java ...ample/data/cassandra/SampleCassandraApplicationTests.java +1 -1

No files found.
--- a/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/SampleCassandraApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-data-cassandra/src/test/java/sample/data/cassandra/SampleCassandraApplicationTests.java
@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @SpringApplicationConfiguration(SampleCassandraApplication.class)
 @IntegrationTest("spring.data.cassandra.port=9142")
 @CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql")
-@EmbeddedCassandra
+@EmbeddedCassandra(timeout = 60000)
 public class SampleCassandraApplicationTests {

 	@ClassRule