diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ce4dfb58..7793048bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [v3.0.3](https://github.com/traefik/traefik/tree/v3.0.3) (2024-06-18) +[All Commits](https://github.com/traefik/traefik/compare/v3.0.2...v3.0.3) + +**Misc:** +- Merge v2.11 into v3.0 ([#10823](https://github.com/traefik/traefik/pull/10823) by [kevinpollet](https://github.com/kevinpollet)) +- Merge v2.11 into v3.0 ([#10810](https://github.com/traefik/traefik/pull/10810) by [mmatur](https://github.com/mmatur)) + ## [v2.11.5](https://github.com/traefik/traefik/tree/v2.11.5) (2024-06-18) [All Commits](https://github.com/traefik/traefik/compare/v2.11.4...v2.11.5) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index f88cb01d7..a536907c8 100644 --- a/script/gcg/traefik-bugfix.toml +++ b/script/gcg/traefik-bugfix.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example new bugfix v3.0.2 +# example new bugfix v3.0.3 CurrentRef = "v3.0" -PreviousRef = "v3.0.1" +PreviousRef = "v3.0.2" BaseBranch = "v3.0" -FutureCurrentRefName = "v3.0.2" +FutureCurrentRefName = "v3.0.3" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10