Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson 2016-02-18 12:48:10 +00:00
commit d66bc7b1ee
1 changed files with 1 additions and 1 deletions

View File

@ -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