Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Security Solution] Fixes breaking type in main #152654

Merged
merged 1 commit into from
Mar 5, 2023

Conversation

dplumlee
Copy link
Contributor

@dplumlee dplumlee commented Mar 5, 2023

Summary

Addresses #152653

Fixes a merge conflict that somehow made its way into main between these two PRs (1, 2)

Checklist

Delete any items that are not applicable to this PR.

For maintainers

@dplumlee dplumlee added bug Fixes for quality problems that affect the customer experience release_note:skip Skip the PR/issue when compiling release notes v8.8.0 labels Mar 5, 2023
@dplumlee dplumlee requested a review from a team as a code owner March 5, 2023 17:09
@dplumlee dplumlee self-assigned this Mar 5, 2023
@dplumlee dplumlee enabled auto-merge (squash) March 5, 2023 17:14
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
securitySolution 15.7MB 15.7MB +76.0B
Unknown metric groups

ESLint disabled line counts

id before after diff
securitySolution 428 430 +2

Total ESLint disabled count

id before after diff
securitySolution 506 508 +2

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @dplumlee

@dplumlee dplumlee merged commit 05f306c into elastic:main Mar 5, 2023
@kibanamachine kibanamachine added the backport:skip This commit does not require backporting label Mar 5, 2023
@dplumlee dplumlee deleted the fix-type-breaking branch March 5, 2023 20:32
bmorelli25 pushed a commit to bmorelli25/kibana that referenced this pull request Mar 10, 2023
Addresses elastic#152653

Fixes a merge conflict that somehow made its way into main between these
two PRs ([1](elastic#152301),
[2](elastic#151952))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:skip This commit does not require backporting bug Fixes for quality problems that affect the customer experience release_note:skip Skip the PR/issue when compiling release notes v8.8.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants