From fb21e3bb5c01b3d10afa0f9974368c001ce3def8 Mon Sep 17 00:00:00 2001 From: Kevin Pollet Date: Tue, 12 Jan 2021 16:30:04 +0100 Subject: [PATCH] Prepare release v2.4.0-rc2 --- CHANGELOG.md | 13 +++++++++++++ script/gcg/traefik-rc-new.toml | 10 +++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91035fcf3..17ad4c76a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +## [v2.4.0-rc2](https://github.com/traefik/traefik/tree/v2.4.0-rc2) (2021-01-12) +[All Commits](https://github.com/traefik/traefik/compare/v2.4.0-rc1...v2.4.0-rc2) + +**Documentation:** +- **[middleware]** Rephrase forwardauth.authRequestHeaders documentation ([#7701](https://github.com/traefik/traefik/pull/7701) by [Beanow](https://github.com/Beanow)) + +**Misc:** +- Merge current v2.3 branch into v2.4 ([#7744](https://github.com/traefik/traefik/pull/7744) by [rtribotte](https://github.com/rtribotte)) +- Merge current v2.3 branch into v2.4 ([#7742](https://github.com/traefik/traefik/pull/7742) by [rtribotte](https://github.com/rtribotte)) +- Merge current v2.3 branch into v2.4 ([#7727](https://github.com/traefik/traefik/pull/7727) by [mmatur](https://github.com/mmatur)) +- Merge current v2.3 branch into v2.4 ([#7703](https://github.com/traefik/traefik/pull/7703) by [kevinpollet](https://github.com/kevinpollet)) +- Merge current v2.3 branch into v2.4 ([#7689](https://github.com/traefik/traefik/pull/7689) by [kevinpollet](https://github.com/kevinpollet)) + ## [v2.3.7](https://github.com/traefik/traefik/tree/v2.3.7) (2021-01-11) [All Commits](https://github.com/traefik/traefik/compare/v2.3.6...v2.3.7) diff --git a/script/gcg/traefik-rc-new.toml b/script/gcg/traefik-rc-new.toml index f66b0fe89..f7bc9f47b 100644 --- a/script/gcg/traefik-rc-new.toml +++ b/script/gcg/traefik-rc-new.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example RC2 of v2.3.0 -CurrentRef = "v2.3" -PreviousRef = "v2.3.0-rc1" -BaseBranch = "v2.3" -FutureCurrentRefName = "v2.3.0-rc2" +# example RC2 of v2.4.0 +CurrentRef = "v2.4" +PreviousRef = "v2.4.0-rc1" +BaseBranch = "v2.4" +FutureCurrentRefName = "v2.4.0-rc2" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10