Merge pull request #18574 from jay-lau/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-11 17:11:38 -08:00
commit a1f6cc3f63

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