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.3 branch into master #7453

Merged
merged 15 commits into from Oct 23, 2020
Merged

Merge current v2.3 branch into master #7453

merged 15 commits into from Oct 23, 2020

Conversation

jbdoumenjou
Copy link
Member

What does this PR do?

Merge current v2.3 branch into master.

Motivation

Be sync.

AndrewSav and others added 15 commits October 15, 2020 14:12
@AndrewSav
Adding details about the default TLS options to the documentation
b80f89e
@AndrewSav
Moving Provider Namespace documentation topic to Configuration Discov…
b1ba424 
…ery section
@ldez
fix: update Yaegi to v0.9.4
c073014
@PCM2
Revise Traefik Pilot documentation section
2e8d99c
@ldez
fix: Consul Catalog address documentation.
04c0722
@rtribotte
Prepare release v2.3.2
3e61d1f
@rtribotte
Fix ingress documentation
2683df7
@pirey
fix typo in providers overview documentation
2282704
@tomtastic
Resolve broken URLs causing make docs to fail
721896b
@tomtastic
Clarify time-based field units
6ad79dc
@kevtainer
add links to contributors guide
582d254
@rtribotte @jbdoumenjou
Use timezone without daylight saving time for logger formatter tests
fc97ea7 
Co-authored-by: jbdoumenjou <925513+jbdoumenjou@users.noreply.github.com>
@andrew-demb
Add missed tls config for yaml example
2dd5a53
@ldez
fix: update Yaegi to v0.9.4
ea459e9
@jbdoumenjou
Merge current v2.3 branch into master
4fccde8
@jbdoumenjou jbdoumenjou added bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-ff status/2-needs-review labels Oct 23, 2020
@jbdoumenjou jbdoumenjou added this to To review in v2 via automation Oct 23, 2020
@jbdoumenjou jbdoumenjou added this to the next milestone Oct 23, 2020
ldez
ldez approved these changes Oct 23, 2020
View reviewed changes
Copy link
Member

@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 removed bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-ff status/3-needs-merge labels Oct 23, 2020
@traefiker traefiker merged commit 4fccde8 into traefik:master Oct 23, 2020
v2 automation moved this from To review to Done Oct 23, 2020
@jbdoumenjou jbdoumenjou deleted the mrg-current-v2.3 branch October 23, 2020 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ldez ldez ldez approved these changes

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

Successfully merging this pull request may close these issues.

None yet
10 participants
@jbdoumenjou @ldez @traefiker @AndrewSav @PCM2 @rtribotte @pirey @tomtastic @kevtainer @andrew-demb