8.14.2: add missing changelog entry (#13555)

Intially only merged on 8.14 branch, should have been merged on main and backported. Also add a missing changelog entry (cherry picked from commit b99e36b) # Conflicts: # changelogs/8.14.asciidoc
elastic · Jul 4, 2024 · 0756862 · 0756862
1 parent 1468300
commit 0756862
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/changelogs/8.14.asciidoc b/changelogs/8.14.asciidoc
@@ -13,6 +13,12 @@ https://github.com/elastic/apm-server/compare/v8.14.1\...v8.14.2[View commits]
 
 No significant changes.
 
+<<<<<<< HEAD
+=======
+=== Added
+- Optimize memory usage and disk read IO for Tail Based Sampling {pull}13464[13464]
+
+>>>>>>> b99e36bde (8.14.2: add missing changelog entry (#13555))
 [float]
 [[apm-release-notes-8.14.1]]
 === APM version 8.14.1