Skip to content

S
spring-boot
Commit 1df3fb6e authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.5.x'

parents 506fb89e b575be33
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java
View file @ 1df3fb6e
......@@ -337,7 +337,7 @@ public class EndpointMBeanExporterTests {
extends AbstractEndpoint<Map<String, Object>> {
public JsonMapConversionEndpoint() {
super("json-map-conversion");
super("json_map_conversion");
}
@Override
......@@ -353,7 +353,7 @@ public class EndpointMBeanExporterTests {
extends AbstractEndpoint<List<Object>> {
public JsonListConversionEndpoint() {
super("json-list-conversion");
super("json_list_conversion");
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment