github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed code confilict symbols from mesos scheduler document.

Browse Source
This commit is contained in:
Jay Lau
2015-12-11 22:32:52 +08:00
parent abf9a90030
commit 85a9303bd6
1 changed files with 0 additions and 1 deletions
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
offer-linger-ttl = 2m
<<<<<<< HEAD
; duration between offer listener notifications
listener-delay = 1s