From c18b4248e578d3f6ad0b5cdb8a3a2fc35f70f956 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 2 Oct 2014 16:44:16 +0100 Subject: [PATCH] Merge 1.1.x with minor conflict --- .../metrics/repository/redis/RedisMetricRepository.java | 4 ---- 1 file changed, 4 deletions(-) diff --git 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 index 931d0caec1e..da42ecc29db 100644 --- 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;