From d42e75bb2eabbe684809929ce96abfe09d4e50fb Mon Sep 17 00:00:00 2001 From: Kevin Pollet Date: Tue, 2 Jul 2024 15:42:03 +0200 Subject: [PATCH] Prepare release v3.0.4 --- CHANGELOG.md | 12 ++++++++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28e3342bb..57aabfe17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## [v3.0.4](https://github.com/traefik/traefik/tree/v3.0.4) (2024-07-02) +[All Commits](https://github.com/traefik/traefik/compare/v3.0.3...v3.0.4) + +**Documentation:** +- **[k8s]** Fix some documentation links ([#10841](https://github.com/traefik/traefik/pull/10841) by [rtribotte](https://github.com/rtribotte)) +- Update maintainers ([#10827](https://github.com/traefik/traefik/pull/10827) by [emilevauge](https://github.com/emilevauge)) + +**Misc:** +- Merge current v2.11 into v3.0 ([#10869](https://github.com/traefik/traefik/pull/10869) by [kevinpollet](https://github.com/kevinpollet)) +- Merge current v2.11 into v3.0 ([#10851](https://github.com/traefik/traefik/pull/10851) by [mmatur](https://github.com/mmatur)) +- Merge current v2.11 into v3.0 ([#10831](https://github.com/traefik/traefik/pull/10831) by [mmatur](https://github.com/mmatur)) + ## [v2.11.6](https://github.com/traefik/traefik/tree/v2.11.6) (2024-07-02) [All Commits](https://github.com/traefik/traefik/compare/v2.11.5...v2.11.6) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index a536907c8..3c593b08b 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.3 +# example new bugfix v3.0.4 CurrentRef = "v3.0" -PreviousRef = "v3.0.2" +PreviousRef = "v3.0.3" BaseBranch = "v3.0" -FutureCurrentRefName = "v3.0.3" +FutureCurrentRefName = "v3.0.4" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10