From 66c816ad5ff8a68a9cc9ed61f42a2dc9c64c8a0d Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Mon, 5 Feb 2024 14:37:23 +0000 Subject: [PATCH] changelog: fix #12176 backport entry PR #12176 changelog should be done in 8.12, not head. #12224 backport is causing conflicts. --- changelogs/8.12.asciidoc | 1 + changelogs/head.asciidoc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc index b4931f409b4..df36348770a 100644 --- 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 index 4f26df531a1..69aeff0caa4 100644 --- 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