From f6e1a3fbc0a5c82818656dbe301c989b59255f8f Mon Sep 17 00:00:00 2001
From: Chris Thain <chris.m.thain@gmail.com>
Date: Fri, 29 Sep 2023 17:12:51 +0000
Subject: [PATCH] backport of commit 9109bdd79163dbdda4ef1e7dc7e990ba2cab8858

---
 .changelog/19031.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/19031.txt

diff --git a/.changelog/19031.txt b/.changelog/19031.txt
new file mode 100644
index 000000000000..a00e116c748b
--- /dev/null
+++ b/.changelog/19031.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+api: add custom marshal/unmarshal for ServiceResolverConfigEntry.RequestTimeout so config entries that set this field can be read using the API.
+```