Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Phillip Webb
2016-11-28 15:40:20 -08:00
parent b4c3f4f504 dada7423b0
commit fe63c981f8
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java
View File

@@ -56,4 +56,5 @@ class HazelcastSessionConfiguration {
}
}
}

1
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
View File

@@ -487,7 +487,6 @@ public class ServerPropertiesTests {
map.put("server.undertow.accesslog.dir", "test-logs");
map.put("server.undertow.accesslog.rotate", "false");
bindProperties(map);
UndertowEmbeddedServletContainerFactory container = spy(
new UndertowEmbeddedServletContainerFactory());
this.properties.getUndertow().customizeUndertow(this.properties, container);