Merge branch '1.4.x' into 1.5.x

2017-04-07 12:14:47 +01:00
parent ddd3f8ee6e 5dad7182db
commit c74f0a70ca
9 changed files with 22 additions and 15 deletions
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java
@@ -244,7 +244,6 @@ public class WebRequestTraceFilterTests {
 	}

 	@Test
-	@SuppressWarnings("unchecked")
 	public void filterAddsTimeTaken() throws Exception {
 		MockHttpServletRequest request = spy(new MockHttpServletRequest("GET", "/foo"));
 		MockHttpServletResponse response = new MockHttpServletResponse();