Merge branch '2.0.x' into 2.1.x

f0ef6933 · Andy Wilkinson · 8c3cec8f · c2eeeb03 · f0ef6933
Commit f0ef6933 authored Mar 11, 2019 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

HttpTunnelIntegrationTests.java .../devtools/integrationtest/HttpTunnelIntegrationTests.java +1 -1

No files found.
--- 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