• Phillip Webb's avatar
    Merge branch '1.1.x' · 6333d4c6
    Phillip Webb authored
    Conflicts:
    	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java
    	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java
    	spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java
    6333d4c6
Name
Last commit
Last update
..
java/org/springframework/boot/autoconfigure Loading commit data...
resources Loading commit data...