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.4 into v2.5 #8333

Merged
merged 4 commits into from Aug 5, 2021

Conversation

jbdoumenjou
Copy link
Member

What does this PR do?

Merge current v2.4 branch into v2.5

Motivation

Be sync.

@jbdoumenjou jbdoumenjou added status/2-needs-review bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-ff labels Aug 5, 2021
@jbdoumenjou jbdoumenjou added this to To review in v2 via automation Aug 5, 2021
@jbdoumenjou jbdoumenjou added this to the 2.5 milestone Aug 5, 2021
jbdoumenjou and others added 3 commits August 5, 2021 17:42
Co-authored-by: Mathieu Lonjaret <mathieu.lonjaret@gmail.com>
Co-authored-by: Romain <rtribotte@users.noreply.github.com>
Co-authored-by: Mathieu Lonjaret <mathieu.lonjaret@gmail.com>
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 status/3-needs-merge bot/light-review decreases the number of required LGTM from 3 to 1. bot/merge-method-ff labels Aug 5, 2021
@traefiker traefiker merged commit 187ec26 into traefik:v2.5 Aug 5, 2021
v2 automation moved this from To review to Done Aug 5, 2021
@jbdoumenjou jbdoumenjou deleted the merge-current-v2.4-into-v2.5 branch August 9, 2021 08:01
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

4 participants