Skip to content

Conversation

@jbdoumenjou
Copy link
Collaborator

@jbdoumenjou jbdoumenjou commented Sep 10, 2019

What does this PR do?

Cherry pick v1.7 into v2.0:

  • 4cae8bc Finish kubernetes throttling refactoring
  • bee370e - Throttle Kubernetes config refresh
  • f397342 - Prepare release v1.7.14

Skip:

  • f4f62e7 - Update Acme doc - Vultr Wildcard & Root
  • f1d016b - Typo in basic auth usersFile label consul-catalog
  • 4defbbe - Kubernetes support for Auth.HeaderField
  • 989a59c - Update to go1.12.8
  • c5b7159 - Make hijackConnectionTracker.Close thread safe

Motivation

Be in sync.

More

  • [ ] Added/updated tests
  • [ ] Added/updated documentation

Copy link
Contributor

@ldez ldez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@traefiker traefiker merged commit 24a2788 into traefik:v2.0 Sep 10, 2019
@traefiker traefiker removed bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-rebase status/3-needs-merge labels Sep 10, 2019
@jbdoumenjou jbdoumenjou deleted the cherry-pick-v1.7 branch September 11, 2019 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants