diff --git a/CHANGELOG.md b/CHANGELOG.md index c22a9dca1..dd59fd431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [v2.5.0-rc6](https://github.com/traefik/traefik/tree/v2.5.0-rc6) (2021-08-13) +[All Commits](https://github.com/traefik/traefik/compare/v2.5.0-rc5...v2.5.0-rc6) + +**Enhancements:** +- Update Go version ([#8355](https://github.com/traefik/traefik/pull/8355) by [mpl](https://github.com/mpl)) + +**Misc:** +- Merge current v2.4 into v2.5 ([#8333](https://github.com/traefik/traefik/pull/8333) by [jbdoumenjou](https://github.com/jbdoumenjou)) + ## [v2.5.0-rc5](https://github.com/traefik/traefik/tree/v2.5.0-rc5) (2021-08-03) [All Commits](https://github.com/traefik/traefik/compare/v2.5.0-rc3...v2.5.0-rc5) diff --git a/script/gcg/traefik-rc-new.toml b/script/gcg/traefik-rc-new.toml index 8a7e3cdde..682b8dec8 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 RC5 of v2.5.0 +# example RC6 of v2.5.0 CurrentRef = "v2.5" -PreviousRef = "v2.5.0-rc4" +PreviousRef = "v2.5.0-rc5" BaseBranch = "v2.5" -FutureCurrentRefName = "v2.5.0-rc5" +FutureCurrentRefName = "v2.5.0-rc6" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10