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.1 branch into master #6409

Merged
merged 24 commits into from Feb 29, 2020
Merged

Merge current v2.1 branch into master #6409

merged 24 commits into from Feb 29, 2020

Conversation

ldez
Copy link
Member

@ldez ldez commented Feb 28, 2020

What does this PR do?

Merge current v2.1 branch into master

Motivation

Be sync.

zaphod42 and others added 23 commits February 10, 2020 21:40
@zaphod42
Don't throw away valid configuration updates
6e43ab5
@ldez
fix: return an error when ping is not enabled.
c33348e
@berekuk
Fix formatting in "Kubernetes Namespace" block
4a1d20e
@jbdoumenjou
fix: use the right error in the log
322c329
@ldez
Early filter of the catalog services.
d501c07
@ldez
Improve documentation.
beec659
@ldez
fix: dashboard example with k8s CRD.
76bb2ef
@BretFisher
Docs: Clarifying format of ingress endpoint service name
8640787
@rYR79435
Remove TLS cipher suites for TLS minVersion 1.3
ef504f3
@ldez
Add information about filename and directory options.
aab7043
@pschaub
Fix typo in the godoc of TLS option MaxVersion
e04ebaa
@dtomcej
Use consistent protocol determination
3b4c8ba
@mmatur
Fix secret informer load
d71e8ab
@juliens
Launch healhcheck only one time instead of two
1e7f34c
@juliens
Consider SSLv2 as TLS in order to close the handshake correctly
1557fda
@ldez
fix: consul-catalog use port from label instead of item port.
9795a7c
@ldez
Update go-acme/lego to v3.4.0
54df7b0
@evanlurvey
Fix docs and code to match in haystack tracing.
f4d62d3
@ldez
Use explicitly the word Kubernetes in the migration guide.
70fdfeb
@dtomcej
Allow fsnotify to reload config files on k8s (or symlinks)
f6c6c2b
@ldez
fix: YML example of template for the file provider.
664cd94
@ldez
Prepare release v2.1.5
1746ed6
@ldez
Prepare release v2.1.6
5072735
@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 Feb 28, 2020
@ldez ldez added this to the 2.2 milestone Feb 28, 2020
@ldez ldez added this to To review in v2 via automation Feb 28, 2020
dtomcej
dtomcej approved these changes Feb 29, 2020
View reviewed changes
Copy link
Contributor

@dtomcej dtomcej left a comment

Choose a reason for hiding this comment

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

LGTM
:shipit:

@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 Feb 29, 2020
@traefiker traefiker merged commit e9d0a16 into traefik:master Feb 29, 2020
v2 automation moved this from To review to Done Feb 29, 2020
@ldez ldez deleted the mrg-current-v2.1 branch February 29, 2020 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtomcej dtomcej dtomcej approved these changes

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

Successfully merging this pull request may close these issues.

None yet