Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zacqary
Zacqary committed Nov 26, 2024
2 parents 7797772 + 4bc9a59 commit 22667db
Show file tree
Hide file tree
Showing 3,622 changed files with 71,037 additions and 47,722 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .backportrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"targetBranchChoices": [
"main",
"8.x",
"8.17",
"8.16",
"8.15",
"8.14",
Expand Down Expand Up @@ -55,7 +56,7 @@
],
"branchLabelMapping": {
"^v9.0.0$": "main",
"^v8.17.0$": "8.x",
"^v8.18.0$": "8.x",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
Expand Down
1 change: 1 addition & 0 deletions .buildkite/ftr_oblt_stateful_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ enabled:
- x-pack/test/api_integration/apis/synthetics/config.ts
- x-pack/test/api_integration/apis/uptime/config.ts
- x-pack/test/api_integration/apis/entity_manager/config.ts
- x-pack/test/api_integration/apis/streams/config.ts
- x-pack/test/apm_api_integration/basic/config.ts
- x-pack/test/apm_api_integration/cloud/config.ts
- x-pack/test/apm_api_integration/rules/config.ts
Expand Down
243 changes: 105 additions & 138 deletions .buildkite/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 22667db

Please sign in to comment.