Merge branch '1.1.x'

This commit is contained in:
Dave Syer 2014-10-01 08:26:58 +01:00
commit dd8db93781

View File

@ -119,6 +119,7 @@ public class MetricFilterAutoConfiguration {
result = result.replace("**", "-star-star-");
result = result.replace("*", "-star-");
result = result.replace("/-", "/");
result = result.replace("-/", "/");
if (result.endsWith("-")) {
result = result.substring(0, result.length() - 1);
}