Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick v1.7 into master #4271

Merged
merged 3 commits into from Dec 5, 2018
Merged

Cherry pick v1.7 into master #4271

merged 3 commits into from Dec 5, 2018

Conversation

ldez
Copy link
Member

@ldez ldez commented Dec 5, 2018 •
edited

What does this PR do?

Cherry pick v1.7 into master:

  • Support canary weight for external name service #4135
  • Query params in health check #4188
  • frame-deny should be set to true to enable the header #4171

Motivation

Be sync.

More

  • Added/updated tests
  • Added/updated documentation

@ldez ldez added status/2-needs-review bot/merge-method-rebase bot/light-review decreases the number of required LGTM from 3 to 1. labels Dec 5, 2018
@ldez ldez added this to the next milestone Dec 5, 2018
@ldez ldez requested a review from a team as a code owner December 5, 2018 13:22
juliens
juliens approved these changes Dec 5, 2018
View reviewed changes
Copy link
Member

@juliens juliens left a comment

Choose a reason for hiding this comment

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

LGTM

@ldez ldez removed the request for review from a team December 5, 2018 13:26
@traefiker traefiker merged commit 057498e into traefik:master Dec 5, 2018
@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 Dec 5, 2018
@ldez ldez deleted the cherry-pick-v1.7 branch December 5, 2018 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliens juliens juliens approved these changes

Assignees
No one assigned
Labels
size/M
Projects
None yet
Milestone
2.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ldez @juliens @traefiker @swestcott @mmatur @yue9944882