diff --git a/CHANGELOG.md b/CHANGELOG.md index b59306169..4d6d15b2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [v3.1.5](https://github.com/traefik/traefik/tree/v3.1.5) (2024-10-02) +[All Commits](https://github.com/traefik/traefik/compare/v3.1.4...v3.1.5) + +**Bug fixes:** +- **[k8s/ingress,k8s]** Disable IngressClass lookup when disableClusterScopeResources is enabled ([#11111](https://github.com/traefik/traefik/pull/11111) by [jnoordsij](https://github.com/jnoordsij)) +- **[server]** Rework condition to not log on timeout ([#11132](https://github.com/traefik/traefik/pull/11132) by [rtribotte](https://github.com/rtribotte)) +- Merge branch v2.11 into v3.1 ([#11149](https://github.com/traefik/traefik/pull/11149) by [kevinpollet](https://github.com/kevinpollet)) +- Merge branch v2.11 into v3.1 ([#11142](https://github.com/traefik/traefik/pull/11142) by [rtribotte](https://github.com/rtribotte)) + ## [v2.11.11](https://github.com/traefik/traefik/tree/v2.11.11) (2024-10-02) [All Commits](https://github.com/traefik/traefik/compare/v2.11.10...v2.11.11) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 56b36a3df..9e3667318 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.1.4 +# example new bugfix v3.1.5 CurrentRef = "v3.1" -PreviousRef = "v3.1.3" +PreviousRef = "v3.1.4" BaseBranch = "v3.1" -FutureCurrentRefName = "v3.1.4" +FutureCurrentRefName = "v3.1.5" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10