diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a929adf..e9533489a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [v3.1.0-rc3](https://github.com/traefik/traefik/tree/v3.1.0-rc3) (2024-07-02) +[All Commits](https://github.com/traefik/traefik/compare/v3.1.0-rc2...v3.1.0-rc3) + +**Bug fixes:** +- **[k8s,k8s/gatewayapi]** Do not disable Gateway API provider if not enabled in experimental ([#10862](https://github.com/traefik/traefik/pull/10862) by [kevinpollet](https://github.com/kevinpollet)) + +**Misc:** +- Merge current v3.0 into v3.1 ([#10871](https://github.com/traefik/traefik/pull/10871) by [rtribotte](https://github.com/rtribotte)) + ## [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) diff --git a/script/gcg/traefik-rc-new.toml b/script/gcg/traefik-rc-new.toml index d29162816..f8fda89cb 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 v3.1.0 +# example rc3 of v3.1.0 CurrentRef = "v3.1" -PreviousRef = "v3.1.0-rc1" +PreviousRef = "v3.1.0-rc2" BaseBranch = "v3.1" -FutureCurrentRefName = "v3.1.0-rc2" +FutureCurrentRefName = "v3.1.0-rc3" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10