Andy Wilkinson
d66bc7b1ee
Merge branch '1.3.x'
2016-02-18 12:48:10 +00:00
Andy Wilkinson
d3074a086c
Increase timeout for startup of embedded Cassandra
...
The integration tests for the Spring Data Cassandra sample application
fail intermittently, apparently due to Cassandra failing to start
within the default timeout period of 10000ms.
In attempt to get the tests to pass reliably, this commit increases
the timeout to 60000ms (1 minute).
2016-02-18 12:46:31 +00:00
Phillip Webb
1cc1fc6431
Use AssertJ in spring-boot-samples
...
See gh-5083
2016-02-06 15:51:26 -08:00
Phillip Webb
fbaf209240
Move master to 1.4.0.BUILD-SNAPSHOT
2016-01-24 10:45:24 -08:00
Spring Buildmaster
504d3e97ba
Next development version
2016-01-21 18:41:30 -08:00
Andy Wilkinson
2aff82bb64
Merge branch '1.2.x'
2016-01-12 10:19:36 +00:00
Spring Buildmaster
8db59059a5
Next Development Version
2015-12-18 05:43:02 -08:00
Spring Buildmaster
3f6f57a80e
Next Development Version
2015-11-16 03:18:54 -08:00
Phillip Webb
634bb770b2
Organize imports with new settings
...
See gh-4234
2015-10-19 12:58:34 -07:00
Andy Wilkinson
995ff66eae
Configure m2e to ignore reserve-network-port in Cassandra sample
2015-10-14 13:23:56 +01:00
Stephane Nicoll
01b23c886f
Use random port for Cassandra tests
...
Closes gh-4028
2015-10-14 11:37:19 +02:00
Phillip Webb
c9fb9916b8
Reformat code using Eclipse Mars
2015-10-07 23:37:10 -07:00
Phillip Webb
31f0c837fd
Fix broken Cassandra sample tests
...
See gh-2064
2015-09-26 01:16:06 -07:00
Julien Dubois
c401330901
Add Cassandra support
...
Add auto-configuration support and health checks for Cassandra and
Spring Data Cassandra.
Fixes gh-2064
Closes gh-2214
2015-09-25 23:00:53 -07:00
