merge 2.x branch with v2.6.2 (#1656)

elastic · Sep 25, 2024 · e1bae6d · e1bae6d
1 parent cff4db9
commit e1bae6d
Show file tree

Hide file tree

Showing 186 changed files with 2,880 additions and 1,525 deletions.
diff --git a/.ci/snapshoty.yml b/.ci/snapshoty.yml
diff --git a/.ci/updatecli.d/update-gherkin-specs.yml b/.ci/updatecli.d/update-gherkin-specs.yml
diff --git a/.ci/updatecli.d/update-json-specs.yml b/.ci/updatecli.d/update-json-specs.yml
diff --git a/.ci/updatecli.d/update-specs.yml b/.ci/updatecli.d/update-specs.yml
diff --git a/.ci/updatecli/values.d/apm-data-spec.yml b/.ci/updatecli/values.d/apm-data-spec.yml
@@ -0,0 +1 @@
+apm_schema_specs_path: internal/apmschema/jsonschema
diff --git a/.ci/updatecli/values.d/apm-gherkin.yml b/.ci/updatecli/values.d/apm-gherkin.yml
@@ -0,0 +1 @@
+apm_gherkin_specs_path: features
diff --git a/.ci/updatecli/values.d/apm-json-specs.yml b/.ci/updatecli/values.d/apm-json-specs.yml
@@ -0,0 +1 @@
+apm_json_specs_path: internal/testdata/json-specs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		apm_schema_specs_path: internal/apmschema/jsonschema
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		apm_json_specs_path: internal/testdata/json-specs