From fdf25b60eda2e1e3bfe94125d93136d103ec5cd3 Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Mon, 3 Mar 2025 14:42:18 -0500
Subject: [PATCH] changelog

---
 .changes/v1.11/BUG FIXES-20250303-144020.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changes/v1.11/BUG FIXES-20250303-144020.yaml

diff --git a/.changes/v1.11/BUG FIXES-20250303-144020.yaml b/.changes/v1.11/BUG FIXES-20250303-144020.yaml
new file mode 100644
index 0000000000..0a1be9fa3c
--- /dev/null
+++ b/.changes/v1.11/BUG FIXES-20250303-144020.yaml	
@@ -0,0 +1,5 @@
+kind: BUG FIXES
+body: Combining ephemeral and sensitive marks could fail when serializing planned changes
+time: 2025-03-03T14:40:20.606817-05:00
+custom:
+    Issue: "36619"