From 21659eef8739115b772c687a167a8b068cf5a4fb Mon Sep 17 00:00:00 2001
From: Nathan Fudenberg <nathan.fudenberg@solo.io>
Date: Thu, 11 Apr 2024 13:49:23 -0400
Subject: [PATCH] 1.25 bump: Upstream to a bit past 11th patch for nghttp2
 updates (#325)

---
 bazel/repository_locations.bzl               | 4 ++--
 changelog/v1.25.11-patch1/upgrade-envoy.yaml | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 changelog/v1.25.11-patch1/upgrade-envoy.yaml

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index 36de6ab60..603c842a0 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -1,7 +1,7 @@
 REPOSITORY_LOCATIONS = dict(
     envoy = dict(
-        # envoy 1.25.10
-        commit = "e208fc2a0e104141100b001613a8932c52e4cee7",
+        # envoy 1.25.11+ a bit
+        commit = "85bd7e2c06f713ad60449c234025df1f5181ed18",
         remote = "https://github.com/envoyproxy/envoy",
     ),
     inja = dict(
diff --git a/changelog/v1.25.11-patch1/upgrade-envoy.yaml b/changelog/v1.25.11-patch1/upgrade-envoy.yaml
new file mode 100644
index 000000000..57d15556b
--- /dev/null
+++ b/changelog/v1.25.11-patch1/upgrade-envoy.yaml
@@ -0,0 +1,7 @@
+changelog:
+- type: DEPENDENCY_BUMP
+  dependencyOwner: envoyproxy
+  dependencyRepo: envoy
+  dependencyTag: v1.25.11ish
+  description: > 
+    Bump envoy to v1.25.11 and a bit
\ No newline at end of file