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

[7.x] [SIEM] [Security] unified code structure phase 0 (#65965) #66221

Merged
merged 3 commits into from
May 15, 2020

Conversation

XavierM
Copy link
Contributor

@XavierM XavierM commented May 12, 2020

Backports the following commits to 7.x:

* apply new structure for teh security solutions

* fix few imports + store

* fix types

* update path in test

* miss path in api_integration

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/siem/public/components/paginated_table/index.tsx
#	x-pack/plugins/siem/public/containers/hosts/index.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.tsx
#	x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
#	x-pack/plugins/siem/public/pages/network/ip_details/index.test.tsx
@flash1293
Copy link
Contributor

flash1293 commented May 13, 2020

I had to resolve some conflicts related to these changes in this backport: #66353

If mine goes in first, there will be a few additional conflicts on this PR. They are all like this: https://github.com/elastic/kibana/pull/66353/files#diff-aac65fe8bca85da1e15538f9619f997dL21

and should be easy to resolve.

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@cnasikas cnasikas merged commit 38f469b into elastic:7.x May 15, 2020
@cnasikas cnasikas deleted the backport/7.x/pr-65965 branch May 15, 2020 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants