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.

Sign up for GitHub

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

Jump to bottom

Fix update-beats CI job for 7.17 #7214

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Fix update-beats CI job for 7.17 #7214

merged 1 commit into from
Feb 7, 2022

Conversation

axw
Copy link
Member

@axw axw commented Feb 7, 2022

Slight variation on #7178 (keeps include/fields.go)

@axw axw added the backport-skip Skip notification from the automated backport with mergify label Feb 7, 2022
@axw axw changed the base branch from main to 7.17 February 7, 2022 06:52
@mergify
Copy link
Contributor

mergify bot commented Feb 7, 2022

This pull request is now in conflicts. Could you fix it @axw? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b update-beats-7.17 upstream/update-beats-7.17
git merge upstream/main
git push upstream update-beats-7.17

@axw axw changed the title Update beats 7.17 Fix update-beats CI job for 7.17 Feb 7, 2022
@axw axw merged commit 224b12d into elastic:7.17 Feb 7, 2022
@axw axw deleted the update-beats-7.17 branch February 7, 2022 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport-skip Skip notification from the automated backport with mergify
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@axw @v1v