mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #18574 from jay-lau/master
Auto commit by PR queue bot
This commit is contained in:
commit
a1f6cc3f63
@ -136,7 +136,6 @@ offer-ttl = 5s
|
||||
; duration an expired offer lingers in history
|
||||
offer-linger-ttl = 2m
|
||||
|
||||
<<<<<<< HEAD
|
||||
; duration between offer listener notifications
|
||||
listener-delay = 1s
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user