Merge branch '1.4.x' into 1.5.x

2017-05-02 21:33:33 -07:00
parent 035e27b1d1 4a95b2f174
commit 4d4d03ab2c
2 changed files with 9 additions and 1 deletions
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/CachePublicMetricsTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/CachePublicMetricsTests.java
@@ -78,7 +78,6 @@ public class CachePublicMetricsTests {
 				entry("cache.anotherCacheManager_foo.size", 0L));
 	}

-
 	private Map<String, Number> metrics(CachePublicMetrics cpm) {
 		Collection<Metric<?>> metrics = cpm.metrics();
 		assertThat(metrics).isNotNull();