Merge branch 'gesellix-healthcheck-docs'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java

@@ -17,10 +17,11 @@
 package org.springframework.boot.actuate.health;
 
 /**
- * Default implementation of {@link HealthIndicator} that simply returns {@literal "ok"}.
+ * Default implementation of {@link HealthIndicator} that simply returns {@literal "UP"}.
  *
  * @author Dave Syer
  * @author Christian Dupuis
+ * @see Status#UP
  */
 public class VanillaHealthIndicator extends AbstractHealthIndicator {
 

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java

@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals;
 public class VanillaHealthIndicatorTests {
 
 	@Test
-	public void ok() throws Exception {
+	public void indicatesUp() throws Exception {
 		VanillaHealthIndicator healthIndicator = new VanillaHealthIndicator();
 		assertEquals(Status.UP, healthIndicator.health().getStatus());
 	}