Merge branch '2.1.x'

2019-02-21 08:19:43 +00:00
parent 3d03c01bfc 53326695ea
commit f2e3e274a8
18 changed files with 37 additions and 38 deletions
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java
@@ -62,6 +62,7 @@ public class ElasticsearchJestHealthIndicatorTests {
 	}

 	@Test
+	@SuppressWarnings("unchecked")
 	public void elasticsearchWithYellowStatusIsUp() throws IOException {
 		given(this.jestClient.execute(any(Action.class)))
 				.willReturn(createJestResult(200, true, "yellow"));