Merge branch '2.0.x' into 2.1.x

6 years ago · f0ef693376
parent 8c3cec8f13 c2eeeb032c
commit f0ef693376
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java
+++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java
@ -128,7 +128,7 @@ public class HttpTunnelIntegrationTests {

 	}

-	@Configuration
+	@org.springframework.context.annotation.Configuration
 	static class TunnelConfiguration {

 		@Bean