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 '2.4.x' into 2.5.x 

Closes gh-26870
This commit is contained in:
Andy Wilkinson 2021-06-11 15:55:31 +01:00
parent 00b9e7f498 608c4509f8
commit 0ab7144bf1
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-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnectionTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
*/ */
class SocketTargetServerConnectionTests { class SocketTargetServerConnectionTests {
private static final int DEFAULT_TIMEOUT = 1000; private static final int DEFAULT_TIMEOUT = 5000;
private MockServer server; private MockServer server;