mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '2.0.x' into 2.1.x
This commit is contained in:
commit
f0ef693376
@ -128,7 +128,7 @@ public class HttpTunnelIntegrationTests {
|
||||
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@org.springframework.context.annotation.Configuration
|
||||
static class TunnelConfiguration {
|
||||
|
||||
@Bean
|
||||
|
Loading…
Reference in New Issue
Block a user