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

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-01-26 14:01:45 +01:00
parent 506fb89ec7 b575be339e
commit 1df3fb6ecb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java
View File

@ -337,7 +337,7 @@ public class EndpointMBeanExporterTests {
extends AbstractEndpoint<Map<String, Object>> { extends AbstractEndpoint<Map<String, Object>> {
public JsonMapConversionEndpoint() { public JsonMapConversionEndpoint() {
super("json-map-conversion"); super("json_map_conversion");
} }
@Override @Override
@ -353,7 +353,7 @@ public class EndpointMBeanExporterTests {
extends AbstractEndpoint<List<Object>> { extends AbstractEndpoint<List<Object>> {
public JsonListConversionEndpoint() { public JsonListConversionEndpoint() {
super("json-list-conversion"); super("json_list_conversion");
} }
@Override @Override