Skip to content

K
k3s
Commit a1f6cc3f authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #18574 from jay-lau/master

Auto commit by PR queue bot
parents 09f9dc7d 85a9303b
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
contrib/mesos/docs/scheduler.md
View file @ a1f6cc3f
...@@ -136,7 +136,6 @@ offer-ttl = 5s ...@@ -136,7 +136,6 @@ offer-ttl = 5s
; duration an expired offer lingers in history ; duration an expired offer lingers in history
offer-linger-ttl = 2m offer-linger-ttl = 2m
<<<<<<< HEAD
; duration between offer listener notifications ; duration between offer listener notifications
listener-delay = 1s listener-delay = 1s
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment