From e90f4a7cb4e2a457ce72b292c2ce383ae71661eb Mon Sep 17 00:00:00 2001
From: Kevin Pollet <pollet.kevin@gmail.com>
Date: Mon, 28 Oct 2024 11:34:03 +0100
Subject: [PATCH] Prepare release v3.1.7

---
 CHANGELOG.md                   | 13 +++++++++++++
 script/gcg/traefik-bugfix.toml |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ad7f1f04..f71230ba2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [v3.1.7](https://github.com/traefik/traefik/tree/v3.1.7) (2024-10-28)
+[All Commits](https://github.com/traefik/traefik/compare/v3.1.6...v3.1.7)
+
+**Bug fixes:**
+- **[k8s,k8s/gatewayapi]** Preserve HTTPRoute filters order ([#11198](https://github.com/traefik/traefik/pull/11198) by [kevinpollet](https://github.com/kevinpollet))
+
+**Documentation:**
+- **[k8s,k8s/gatewayapi]** Fix broken links in Kubernetes Gateway provider page ([#11188](https://github.com/traefik/traefik/pull/11188) by [mloiseleur](https://github.com/mloiseleur))
+
+**Misc:**
+- Merge branch v2.11 into v3.1 ([#11232](https://github.com/traefik/traefik/pull/11232) by [kevinpollet](https://github.com/kevinpollet))
+- Merge branch v2.11 into v3.1 ([#11218](https://github.com/traefik/traefik/pull/11218) by [kevinpollet](https://github.com/kevinpollet))
+
 ## [v2.11.13](https://github.com/traefik/traefik/tree/v2.11.13) (2024-10-28)
 [All Commits](https://github.com/traefik/traefik/compare/v2.11.12...v2.11.13)
 
diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml
index 8e06b98e3..90dee22cf 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.6
+# example new bugfix v3.1.7
 CurrentRef = "v3.1"
-PreviousRef = "v3.1.5"
+PreviousRef = "v3.1.6"
 BaseBranch = "v3.1"
-FutureCurrentRefName = "v3.1.6"
+FutureCurrentRefName = "v3.1.7"
 
 ThresholdPreviousRef = 10
 ThresholdCurrentRef = 10