From 385ff5055ce29cb6c0eed4a2b700776729adfbc1 Mon Sep 17 00:00:00 2001 From: Romain Date: Tue, 18 Jun 2024 12:00:04 +0200 Subject: [PATCH 1/4] Prepare release v2.11.5 --- CHANGELOG.md | 9 +++++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 789cc6769..5f20c6c15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [v2.11.5](https://github.com/traefik/traefik/tree/v2.11.5) (2024-06-18) +[All Commits](https://github.com/traefik/traefik/compare/v2.11.4...v2.11.5) + +**Bug fixes:** +- **[acme]** Update go-acme/lego to v4.17.4 ([#10803](https://github.com/traefik/traefik/pull/10803) by [ldez](https://github.com/ldez)) + +**Documentation:** +- Update the supported versions table ([#10798](https://github.com/traefik/traefik/pull/10798) by [nmengin](https://github.com/nmengin)) + ## [v2.11.4](https://github.com/traefik/traefik/tree/v2.11.4) (2024-06-10) [All Commits](https://github.com/traefik/traefik/compare/v2.11.3...v2.11.4) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index a8a354286..9d6664d50 100644 --- a/script/gcg/traefik-bugfix.toml +++ b/script/gcg/traefik-bugfix.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example new bugfix v2.11.4 +# example new bugfix v2.11.5 CurrentRef = "v2.11" -PreviousRef = "v2.11.3" +PreviousRef = "v2.11.4" BaseBranch = "v2.11" -FutureCurrentRefName = "v2.11.4" +FutureCurrentRefName = "v2.11.5" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10 From 53a8bd76f21835e457ee730bb73839cf99e77db1 Mon Sep 17 00:00:00 2001 From: Kevin Pollet Date: Tue, 18 Jun 2024 16:10:06 +0200 Subject: [PATCH 2/4] Prepare release v3.0.3 --- CHANGELOG.md | 7 +++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ce4dfb58..7793048bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [v3.0.3](https://github.com/traefik/traefik/tree/v3.0.3) (2024-06-18) +[All Commits](https://github.com/traefik/traefik/compare/v3.0.2...v3.0.3) + +**Misc:** +- Merge v2.11 into v3.0 ([#10823](https://github.com/traefik/traefik/pull/10823) by [kevinpollet](https://github.com/kevinpollet)) +- Merge v2.11 into v3.0 ([#10810](https://github.com/traefik/traefik/pull/10810) by [mmatur](https://github.com/mmatur)) + ## [v2.11.5](https://github.com/traefik/traefik/tree/v2.11.5) (2024-06-18) [All Commits](https://github.com/traefik/traefik/compare/v2.11.4...v2.11.5) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index f88cb01d7..a536907c8 100644 --- a/script/gcg/traefik-bugfix.toml +++ b/script/gcg/traefik-bugfix.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example new bugfix v3.0.2 +# example new bugfix v3.0.3 CurrentRef = "v3.0" -PreviousRef = "v3.0.1" +PreviousRef = "v3.0.2" BaseBranch = "v3.0" -FutureCurrentRefName = "v3.0.2" +FutureCurrentRefName = "v3.0.3" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10 From eabcb3e1c0211299a6cb46bac3e27a5234a552f1 Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Wed, 19 Jun 2024 17:18:03 +0200 Subject: [PATCH 3/4] Update maintainers --- docs/content/contributing/maintainers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/contributing/maintainers.md b/docs/content/contributing/maintainers.md index e91bfcc89..a340156fc 100644 --- a/docs/content/contributing/maintainers.md +++ b/docs/content/contributing/maintainers.md @@ -9,7 +9,6 @@ description: "Traefik Proxy is an open source software with a thriving community * Emile Vauge [@emilevauge](https://github.com/emilevauge) * Manuel Zapf [@SantoDE](https://github.com/SantoDE) -* Ludovic Fernandez [@ldez](https://github.com/ldez) * Julien Salleyron [@juliens](https://github.com/juliens) * Nicolas Mengin [@nmengin](https://github.com/nmengin) * Michaël Matur [@mmatur](https://github.com/mmatur) @@ -33,6 +32,7 @@ People who have had an incredibly positive impact on the project, and are now fo * Daniel Tomcej [@dtomcej](https://github.com/dtomcej) * Timo Reimann [@timoreimann](https://github.com/timoreimann) * Marco Jantke [@mjantke](https://github.com/mjeri) +* Ludovic Fernandez [@ldez](https://github.com/ldez) ## Maintainer's Guidelines From 097e71ad24d9a71b5a737c8bf81cd5a245bc4626 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 21 Jun 2024 08:54:03 +0200 Subject: [PATCH 4/4] fix: readme badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a017443e..245baf434 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

-[![Build Status SemaphoreCI](https://semaphoreci.com/api/v1/containous/traefik/branches/master/shields_badge.svg)](https://semaphoreci.com/containous/traefik) +[![Build Status SemaphoreCI](https://traefik-oss.semaphoreci.com/badges/traefik/branches/master.svg?style=shields)](https://traefik-oss.semaphoreci.com/projects/traefik) [![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://doc.traefik.io/traefik) [![Go Report Card](https://goreportcard.com/badge/traefik/traefik)](https://goreportcard.com/report/traefik/traefik) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/traefik/traefik/blob/master/LICENSE.md)