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.

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

Merge current v2.2 branch into master #7052

Merged
merged 8 commits into from
Jul 15, 2020
Merged

Conversation

ldez
Copy link
Member

@ldez ldez commented Jul 15, 2020

What does this PR do?

Merge current v2.2 branch into master

Motivation

Be sync.

jbdoumenjou and others added 8 commits July 10, 2020 18:48
* fix: allow domain fronting by default

* review: typo.

* review: doc.

Co-authored-by: Fernandez Ludovic <ludovic@containo.us>
Co-authored-by: John Pekcan <apekcan@ea.com>
* revert domain fronting changes

* reintroduce HostHeader rule

* add doc for removals
@ldez ldez added status/2-needs-review bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-ff labels Jul 15, 2020
@ldez ldez added this to the next milestone Jul 15, 2020
@ldez ldez added this to To review in v2 via automation Jul 15, 2020
Copy link
Member

@jbdoumenjou jbdoumenjou 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 removed bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-ff status/3-needs-merge labels Jul 15, 2020
@traefiker traefiker merged commit 6e4f582 into traefik:master Jul 15, 2020
v2 automation moved this from To review to Done Jul 15, 2020
@ldez ldez deleted the mrg-current-v2.2 branch July 15, 2020 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
v2
Done
Development

Successfully merging this pull request may close these issues.

None yet

6 participants