From cf14504fd5267e572c0f20debfedd3558b028f5f Mon Sep 17 00:00:00 2001 From: Tom Moulard Date: Wed, 12 Jan 2022 16:40:06 +0100 Subject: [PATCH] Prepare release v2.6.0-rc2 --- CHANGELOG.md | 12 ++++++++++++ script/gcg/traefik-rc-new.toml | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1db225a9..6ce58cf73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## [v2.6.0-rc2](https://github.com/traefik/traefik/tree/v2.6.0-rc2) (2022-01-12) +[All Commits](https://github.com/traefik/traefik/compare/v2.6.0-rc1...v2.6.0-rc2) + +**Bug fixes:** +- **[consul,kv]** Support Consul KV Enterprise namespaces ([#8692](https://github.com/traefik/traefik/pull/8692) by [kevinpollet](https://github.com/kevinpollet)) +- **[tracing]** Upgrade Instana tracer dependency ([#8687](https://github.com/traefik/traefik/pull/8687) by [andriikushch](https://github.com/andriikushch)) + +**Misc:** +- Merge current v2.5 into v2.6 ([#8688](https://github.com/traefik/traefik/pull/8688) by [tomMoulard](https://github.com/tomMoulard)) +- Merge current v2.5 into v2.6 ([#8664](https://github.com/traefik/traefik/pull/8664) by [tomMoulard](https://github.com/tomMoulard)) +- Merge current v2.5 into v2.6 ([#8651](https://github.com/traefik/traefik/pull/8651) by [tomMoulard](https://github.com/tomMoulard)) + ## [v2.5.6](https://github.com/traefik/traefik/tree/v2.5.6) (2021-12-22) [All Commits](https://github.com/traefik/traefik/compare/v2.5.5...v2.5.6) diff --git a/script/gcg/traefik-rc-new.toml b/script/gcg/traefik-rc-new.toml index 682b8dec8..135b1b707 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 RC6 of v2.5.0 -CurrentRef = "v2.5" -PreviousRef = "v2.5.0-rc5" -BaseBranch = "v2.5" -FutureCurrentRefName = "v2.5.0-rc6" +# example RC2 of v2.6.0 +CurrentRef = "v2.6" +PreviousRef = "v2.6.0-rc1" +BaseBranch = "v2.6" +FutureCurrentRefName = "v2.6.0-rc2" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10