Merge 1.1.x with minor conflict

10 years ago · c18b4248e5
parent e913b35227
commit c18b4248e5
1 changed files with 0 additions and 4 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
@ -45,13 +45,9 @@ public class RedisMetricRepository implements MetricRepository, InitializingBean

 	private static final String DEFAULT_METRICS_PREFIX = "spring.metrics";

-<<<<<<< HEAD
-	private String prefix = DEFAULT_METRICS_PREFIX  + ".";
-=======
 	private static final String DEFAULT_KEY = "keys." + DEFAULT_METRICS_PREFIX;

 	private String prefix = DEFAULT_METRICS_PREFIX;
->>>>>>> 1.1.x

 	private String key = DEFAULT_KEY;