From da7bb5fc25ab21d6a8f5ff6ca44eeaddc47ee210 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Thu, 11 Apr 2024 18:24:03 +0200 Subject: [PATCH] Prepare release v3.0.0-rc5 --- CHANGELOG.md | 6 ++++++ script/gcg/traefik-rc-new.toml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80be416e7..866bbc10b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [v3.0.0-rc5](https://github.com/traefik/traefik/tree/v3.0.0-rc4) (2024-04-11) +[All Commits](https://github.com/traefik/traefik/compare/v3.0.0-rc4...v3.0.0-rc5) + +**Misc:** +- Merge current v2.11 into v3.0 ([#10604](https://github.com/traefik/traefik/pull/10604) by [ldez](https://github.com/ldez)) + ## [v2.11.2](https://github.com/traefik/traefik/tree/v2.11.2) (2024-04-11) [All Commits](https://github.com/traefik/traefik/compare/v2.11.1...v2.11.2) diff --git a/script/gcg/traefik-rc-new.toml b/script/gcg/traefik-rc-new.toml index 7af5b4ea9..2a7377a1f 100644 --- a/script/gcg/traefik-rc-new.toml +++ b/script/gcg/traefik-rc-new.toml @@ -6,9 +6,9 @@ FileName = "traefik_changelog.md" # example rc4 of v3.0.0 CurrentRef = "v3.0" -PreviousRef = "v3.0.0-rc3" +PreviousRef = "v3.0.0-rc4" BaseBranch = "v3.0" -FutureCurrentRefName = "v3.0.0-rc4" +FutureCurrentRefName = "v3.0.0-rc5" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10