Merge 1.1.x with minor conflict

pull/1659/head
Dave Syer 10 years ago
parent e913b35227
commit c18b4248e5

@ -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;

Loading…
Cancel
Save