changelog: fix elastic#12176 backport entry

PR elastic#12176 changelog should be done in 8.12, not head. elastic#12224 backport is causing conflicts.
carsonip · Feb 5, 2024 · 66c816a · 66c816a
1 parent c6650c5
commit 66c816a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc
@@ -13,6 +13,7 @@ https://github.com/elastic/apm-server/compare/v8.11.4\...v8.12.0[View commits]
 ==== Breaking Changes
 - The unsupported apm_data_stream_migration ingest pipeline has been removed {pull}12102[12102].
 - "publish_ready" is always false in the "GET /" response until events are received by apm-server {pull}12150[12150]
+- Reverts a breaking change that ignored the beat name. This is visible in Stack Monitoring {pull}12176[12176]
 - A bug has been introduced, so that `traces-apm@custom` ingest pipeline is now additionally applied to data streams `traces-apm.sampled-*` and `traces-apm.rum-*` and applied twice for `traces-apm-*`. See more details and information around a fix in the Known Issues section.
 
 [float]

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -5,7 +5,6 @@ https://github.com/elastic/apm-server/compare/8.12\...main[View commits]
 
 [float]
 ==== Breaking Changes
-- Reverts a breaking change that ignored the beat name. This is visible in Stack Monitoring {pull}12176[12176]
 
 [float]
 ==== Bug fixes
-Original file line number
+Diff line change
@@ Expand Up @@
     [float]
     ==== Breaking Changes
-    - Reverts a breaking change that ignored the beat name. This is visible in Stack Monitoring {pull}12176[12176]
     [float]
     ==== Bug fixes
@@ Expand Down @@