Skip to content

Commit fe63c98

Browse files
committed
Merge branch '1.5.x'
2 parents b4c3f4f + dada742 commit fe63c98

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,5 @@ public void customize(SessionProperties sessionProperties) {
5656
}
5757

5858
}
59+
5960
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,6 @@ public void customizeUndertowAccessLog() {
487487
map.put("server.undertow.accesslog.dir", "test-logs");
488488
map.put("server.undertow.accesslog.rotate", "false");
489489
bindProperties(map);
490-
491490
UndertowEmbeddedServletContainerFactory container = spy(
492491
new UndertowEmbeddedServletContainerFactory());
493492
this.properties.getUndertow().customizeUndertow(this.properties, container);

0 commit comments

Comments
 (0)