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

Merge current v2.2 branch into master #6754

Merged
merged 42 commits into from
Apr 30, 2020
Merged

Merge current v2.2 branch into master #6754

merged 42 commits into from
Apr 30, 2020

Conversation

ldez
Copy link
Member

@ldez ldez commented Apr 30, 2020

What does this PR do?

Merge current v2.2 branch into master

Motivation

Be sync.

mavimo and others added 30 commits March 21, 2020 20:22
@mavimo
Fix tab name
198320b
@ldez
Fix sameSite (Traefik v2)
0c28630
@ldez
doc: fix terminationDelay word case.
b0c7fad
@ldez
fix: period field name.
ee06778
@juliens
Force http/1.1 for upgrade (Traefik v2)
dd436a6
@ldez
Prepare release v2.1.9
dd19fc3
@ldez
Merge branch v2.1 into v2.2
b54412e
@mpl
digest auth: use RequireAuthStale when appropriate
69de5bb
@ldez
Prepare release v2.2.0
5560ab2
@ajschmidt8
Doc Fix for 2.2 Redirects
aa68cc2
@ldez
Change the default priority on the router created by the redirect.
a6b6e1d
@ldez
Normalize default names for ConsulCatalog.
6f749c6
@RealOrangeOne
It's just the one TLS, actually.
5c8d386
@Beetix
Fix bad address syntax in Global HTTP to HTTPS redirection v2 TOML
332c314
@jbdoumenjou
Delete an unnecessary warning log
ac1657d
@mmatur
Add note about health check in kubernetes
148400a
@mmatur
Fix documentation
6c08d0b
@SuperSandro2000
Fix typos in documentation
0d7761f
@thisismydesign
Fix documentation about api.insecure defaults
77bf3ac
@collinmutembei
Add link to tracing with elastic
76c2fa6
@jamct
Update headers.md
619bc95
@mmatur
FIx wS heAder
daf4258
@fsoedjede
Added missing text a yaml file in Configuration
d0b21ef
@ldez
doc: improve CRD documentation.
f55a098
@nrwiersma
fix: consider UDP when checking for empty config
2171cb7
@fbruetting
Edit code indentation for correct alignment
fe5a4a2
@tbrandstetter
Fix case-sensitive header Sec-Websocket-Version
756aa82
@MartinKoerner
Add Access log chapter for migration v1->v2
40b4032
@ldez
Update go-acme/lego to v3.6.0
e1d51b5
@SantoDE
Add sentence about the resource namespace and middleware
4fcf7bf
jbdoumenjou
jbdoumenjou approved these changes Apr 30, 2020
View reviewed changes
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 Apr 30, 2020
@traefiker traefiker merged commit 6b11582 into traefik:master Apr 30, 2020
@traefiker traefiker added this to Done in v2 via automation Apr 30, 2020
@ldez ldez deleted the mrg-current-master branch April 30, 2020 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jbdoumenjou jbdoumenjou jbdoumenjou approved these changes

Assignees
No one assigned
Labels
size/L
Projects
No open projects
v2
Done
Milestone
2.3
Development

Successfully merging this pull request may close these issues.

None yet