root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Andy Wilkinson 2019-03-11 16:28:29 +00:00
parent 8c3cec8f13 c2eeeb032c
commit f0ef693376
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java
View File

@ -128,7 +128,7 @@ public class HttpTunnelIntegrationTests {
} }
@Configuration @org.springframework.context.annotation.Configuration
static class TunnelConfiguration { static class TunnelConfiguration {
@Bean @Bean