Skip to content

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Aug 7, 2020

Once this PR is merged, you can update the PR labels via:

$ for pr in 12822; do contrib/backporting/set-labels.py $pr done 1.6; done

[ upstream commit bd89e83 ]

This option governs how long Cilium agent will wait to synchronize local
caches with global Kubernetes state before exiting. The default is 3
minutes. Don't expose it by default, this is for advanced tweaking.

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer requested a review from a team as a code owner August 7, 2020 19:44
@joestringer joestringer added backport/1.6 kind/backports This PR provides functionality previously merged into master. labels Aug 7, 2020
@joestringer
Copy link
Member Author

test-backport-1.6

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 8, 2020
@tklauser tklauser merged commit d9886df into v1.6 Aug 8, 2020
@tklauser tklauser deleted the pr/v1.6-backport-2020-08-07 branch August 8, 2020 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants