From de55794381cb82ef47f68fe2a057652759f4a4ad Mon Sep 17 00:00:00 2001 From: lou Date: Wed, 15 Nov 2023 17:24:02 +0800 Subject: [PATCH] update changelog Signed-off-by: lou --- changelogs/unreleased/6917-27149chen | 1 - changelogs/unreleased/7049-27149chen | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 changelogs/unreleased/6917-27149chen create mode 100644 changelogs/unreleased/7049-27149chen diff --git a/changelogs/unreleased/6917-27149chen b/changelogs/unreleased/6917-27149chen deleted file mode 100644 index 94648eaa4..000000000 --- a/changelogs/unreleased/6917-27149chen +++ /dev/null @@ -1 +0,0 @@ -Support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers \ No newline at end of file diff --git a/changelogs/unreleased/7049-27149chen b/changelogs/unreleased/7049-27149chen new file mode 100644 index 000000000..1605d1f5f --- /dev/null +++ b/changelogs/unreleased/7049-27149chen @@ -0,0 +1 @@ +Cherry-pick #6917 - Support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers \ No newline at end of file