From 0c014f7e46fbeca3c734fe8bbee5dee939a0bb02 Mon Sep 17 00:00:00 2001
From: "elastic-observability-automation[bot]"
 <180520183+elastic-observability-automation[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 16:39:51 +0000
Subject: [PATCH] docs: Update changelogs for 8.18 release (#15470)

Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com>
(cherry picked from commit 711b3e6fdb069c6c07114e8fa84ef88c7de39a2f)

# Conflicts:
#	changelogs/8.18.asciidoc
---
 changelogs/8.18.asciidoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelogs/8.18.asciidoc b/changelogs/8.18.asciidoc
index 058e2d067a..c8a94b3040 100644
--- a/changelogs/8.18.asciidoc
+++ b/changelogs/8.18.asciidoc
@@ -23,3 +23,7 @@ https://github.com/elastic/apm-server/compare/v8.17.1\...v8.18.0[View commits]
 
 [float]
 ==== Added
+<<<<<<< HEAD
+=======
+- Tail-based sampling: Storage layer is rewritten to use Pebble database instead of BadgerDB. The new implementation offers a substantial throughput increase while consuming significantly less memory. Disk usage is lower and more stable. See PR for benchmark details. {pull}15235[15235]
+>>>>>>> 711b3e6f (docs: Update changelogs for 8.18 release (#15470))