Skip to content

Commit

Permalink
conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@animehart
animehart committed Feb 6, 2024
2 parents 1d51a88 + 5c8efc2 commit cdcef1b
Show file tree
Hide file tree
Showing 1,993 changed files with 43,954 additions and 13,811 deletions.
2 changes: 2 additions & 0 deletions .buildkite/ftr_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,12 @@ enabled:
- x-pack/test_serverless/api_integration/test_suites/observability/config.ts
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
- x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
- x-pack/test_serverless/api_integration/test_suites/observability/fleet/config.ts
- x-pack/test_serverless/api_integration/test_suites/search/config.ts
- x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts
- x-pack/test_serverless/api_integration/test_suites/security/config.ts
- x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts
- x-pack/test_serverless/api_integration/test_suites/security/fleet/config.ts
- x-pack/test_serverless/functional/test_suites/observability/config.ts
- x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
- x-pack/test_serverless/functional/test_suites/observability/config.saved_objects_management.ts
Expand Down
3 changes: 3 additions & 0 deletions .buildkite/pipelines/emergency_release.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
steps:
- label: Placeholder
command: echo "Hello!"
Loading

0 comments on commit cdcef1b

Please sign in to comment.