Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Andy Wilkinson
2019-03-11 16:28:29 +00:00

View File

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