Merge 1.1.x with minor conflict

2014-10-02 16:43:56 +01:00
parent 003d9a5799 d724c9062b
commit e913b35227
2 changed files with 23 additions and 4 deletions
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java
@@ -44,6 +44,7 @@ public class RedisMetricRepositoryTests {
 		this.repository = new RedisMetricRepository(this.redis.getResource());
 		this.prefix = "spring.test." + System.currentTimeMillis();
 		this.repository.setPrefix(this.prefix);
+		this.repository.afterPropertiesSet();
 	}

 	@After