Merge branch '1.5.x'

2017-03-23 16:10:35 -07:00
parent 9bacca7aa0 cb38546d8a
commit 6ad46db944
2 changed files with 23 additions and 1 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java
@@ -142,7 +142,7 @@ public class TraceProperties {
 		REMOTE_USER,

 		/**
-		 * Include the time taken to service the request.
+		 * Include the time taken to service the request in milliseconds.
 		 */
 		TIME_TAKEN