root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge 1.1.x with minor conflict

This commit is contained in:
Dave Syer 2014-10-02 16:44:16 +01:00
parent e913b35227
commit c18b4248e5
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
View File

@ -45,13 +45,9 @@ public class RedisMetricRepository implements MetricRepository, InitializingBean
private static final String DEFAULT_METRICS_PREFIX = "spring.metrics"; 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 static final String DEFAULT_KEY = "keys." + DEFAULT_METRICS_PREFIX;
private String prefix = DEFAULT_METRICS_PREFIX; private String prefix = DEFAULT_METRICS_PREFIX;
>>>>>>> 1.1.x
private String key = DEFAULT_KEY; private String key = DEFAULT_KEY;