Merge branch '2.0.x'

2018-07-02 13:18:45 -07:00
parent c3641c480b 673a08d228
commit 149c7a85c3
4 changed files with 26 additions and 0 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -1273,6 +1273,7 @@ read timeout of 500ms can be specified in any of the following form: `500`, `PT0
 You can also use any of the supported unit. These are:

 * `ns` for nanoseconds
+* `us` for microseconds
 * `ms` for milliseconds
 * `s` for seconds
 * `m` for minutes