Merge branch '2.1.x'

pull/16539/head
Stephane Nicoll 6 years ago
commit 4d4566e0f9

@ -1442,7 +1442,7 @@ available:
`@DurationUnit` has been specified) `@DurationUnit` has been specified)
* The standard ISO-8601 format * The standard ISO-8601 format
{java-javadoc}/java/time/Duration.html#parse-java.lang.CharSequence-[used by {java-javadoc}/java/time/Duration.html#parse-java.lang.CharSequence-[used by
`java.util.Duration`] `java.time.Duration`]
* A more readable format where the value and the unit are coupled (e.g. `10s` means 10 * A more readable format where the value and the unit are coupled (e.g. `10s` means 10
seconds) seconds)

Loading…
Cancel
Save