diff --git a/CHANGELOG.md b/CHANGELOG.md index 54f9e8bd6..38de56a91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [v2.6.0-rc3](https://github.com/traefik/traefik/tree/v2.6.0-rc3) (2022-01-20) +[All Commits](https://github.com/traefik/traefik/compare/v2.6.0-rc2...v2.6.0-rc3) + +**Bug fixes:** +- **[consul]** Support token authentication for Consul KV ([#8712](https://github.com/traefik/traefik/pull/8712) by [kevinpollet](https://github.com/kevinpollet)) + +**Misc:** +- Merge current v2.5 into v2.6 ([#8717](https://github.com/traefik/traefik/pull/8717) by [tomMoulard](https://github.com/tomMoulard)) +- Merge current v2.5 into v2.6 ([#8714](https://github.com/traefik/traefik/pull/8714) by [rtribotte](https://github.com/rtribotte)) + ## [v2.5.7](https://github.com/traefik/traefik/tree/v2.5.7) (2022-01-20) [All Commits](https://github.com/traefik/traefik/compare/v2.5.6...v2.5.7) diff --git a/script/gcg/traefik-rc-new.toml b/script/gcg/traefik-rc-new.toml index 135b1b707..5c30da9c1 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.6.0 +# example RC3 of v2.6.0 CurrentRef = "v2.6" -PreviousRef = "v2.6.0-rc1" +PreviousRef = "v2.6.0-rc2" BaseBranch = "v2.6" -FutureCurrentRefName = "v2.6.0-rc2" +FutureCurrentRefName = "v2.6.0-rc3" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10