github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18574 from jay-lau/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-11 17:11:38 -08:00
commit a1f6cc3f63
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/mesos/docs/scheduler.md
View File

@ -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