docs: Update changelogs for 8.18 release (#15470)

Co-authored-by: obltmachine <[email protected]> (cherry picked from commit 711b3e6) # Conflicts: # changelogs/8.18.asciidoc
elastic · Jan 30, 2025 · 0c014f7 · 0c014f7
1 parent 20f3ba6
commit 0c014f7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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))