From 858a236327e54739d5b5c1fb2a16302104e41b9a Mon Sep 17 00:00:00 2001
From: Brandon Morelli <brandon.morelli@elastic.co>
Date: Mon, 16 Oct 2023 10:13:31 -0700
Subject: [PATCH 1/2] add 8.10.4 release notes (#11864)

(cherry picked from commit bc7830162bdb86f80ff9b649ebf3789a7fdaf3af)

# Conflicts:
#	changelogs/head.asciidoc
---
 changelogs/8.10.asciidoc | 10 ++++++++++
 changelogs/head.asciidoc | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 changelogs/head.asciidoc

diff --git a/changelogs/8.10.asciidoc b/changelogs/8.10.asciidoc
index 1684baae1bd..36b3381ab72 100644
--- a/changelogs/8.10.asciidoc
+++ b/changelogs/8.10.asciidoc
@@ -3,11 +3,21 @@
 
 https://github.com/elastic/apm-server/compare/8.9\...8.10[View commits]
 
+* <<release-notes-8.10.4>>
 * <<release-notes-8.10.3>>
 * <<release-notes-8.10.2>>
 * <<release-notes-8.10.1>>
 * <<release-notes-8.10.0>>
 
+[float]
+[[release-notes-8.10.4]]
+=== APM version 8.10.4
+
+[float]
+==== Bug fixes
+
+- RPM package upgrade no longer overwrites the apm-server.yml config {pull}11808[11808]
+
 [float]
 [[release-notes-8.10.3]]
 === APM version 8.10.3
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
new file mode 100644
index 00000000000..14ea9cdac2f
--- /dev/null
+++ b/changelogs/head.asciidoc
@@ -0,0 +1,21 @@
+[[release-notes-head]]
+== APM version HEAD
+
+https://github.com/elastic/apm-server/compare/8.11\...main[View commits]
+
+[float]
+==== Breaking Changes
+
+[float]
+==== Bug fixes
+- Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729].
+
+[float]
+==== Deprecations
+
+[float]
+==== Intake API Changes
+
+[float]
+==== Added
+- Update container base image to Ubuntu 22.04 {pull}11778[11778]

From 6c0df7887f0a10d722ad1b555240787305307126 Mon Sep 17 00:00:00 2001
From: Brandon Morelli <brandon.morelli@elastic.co>
Date: Mon, 16 Oct 2023 10:31:08 -0700
Subject: [PATCH 2/2] Delete changelogs/head.asciidoc

---
 changelogs/head.asciidoc | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 changelogs/head.asciidoc

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
deleted file mode 100644
index 14ea9cdac2f..00000000000
--- a/changelogs/head.asciidoc
+++ /dev/null
@@ -1,21 +0,0 @@
-[[release-notes-head]]
-== APM version HEAD
-
-https://github.com/elastic/apm-server/compare/8.11\...main[View commits]
-
-[float]
-==== Breaking Changes
-
-[float]
-==== Bug fixes
-- Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729].
-
-[float]
-==== Deprecations
-
-[float]
-==== Intake API Changes
-
-[float]
-==== Added
-- Update container base image to Ubuntu 22.04 {pull}11778[11778]