Merge 1.1.x with minor conflict

c18b4248 · Dave Syer · e913b352 · c18b4248
Commit c18b4248 authored Oct 02, 2014 by Dave Syer
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

RedisMetricRepository.java ...tuate/metrics/repository/redis/RedisMetricRepository.java +0 -4

No files found.
--- 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;