Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix javadoc

Browse Source
This commit is contained in:
Madhura Bhave
2017-12-08 15:32:40 -08:00
parent b7d08ee570
commit 954cf72de4
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
View File

@@ -568,10 +568,8 @@ public class ServerProperties {
private File basedir;
/**
* <<<<<<< HEAD Delay between the invocation of backgroundProcess methods. If a
* duration suffix is not specified, seconds will be used. ======= Delay, in
* seconds, between the invocation of backgroundProcess methods. >>>>>>> Align
* edits with code
* Delay between the invocation of backgroundProcess methods. If a
* duration suffix is not specified, seconds will be used.
*/
@DefaultDurationUnit(ChronoUnit.SECONDS)
private Duration backgroundProcessorDelay = Duration.ofSeconds(30);
@@ -914,9 +912,7 @@ public class ServerProperties {
public static class Resource {
/**
* <<<<<<< HEAD Time-to-live of the static resource cache. =======
* Time-to-live, in milliseconds, of the static resource cache. >>>>>>> Align
* edits with code
* Time-to-live of the static resource cache.
*/
private Duration cacheTtl;