Merge branch 'main' into main

elastic · Jan 17, 2023 · 7884041 · 7884041
2 parents 2d21408 + a4cf50c
commit 7884041
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 580 deletions.
diff --git a/fleet_packages.json b/fleet_packages.json
@@ -20,7 +20,7 @@
 [
   {
     "name": "apm",
-    "version": "8.7.0-preview-1673519880",
+    "version": "8.7.0-preview-1673959201",
     "forceAlignStackVersion": true
   },
   {

diff --git a/x-pack/plugins/task_manager/server/lib/retry_on_bulk_update_conflict.test.ts b/x-pack/plugins/task_manager/server/lib/retry_on_bulk_update_conflict.test.ts