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: resolve conflict in 455b052569 #29722

Merged
merged 1 commit into from
Jan 6, 2022
Merged

fix: resolve conflict in 455b052569 #29722

merged 1 commit into from
Jan 6, 2022

Conversation

dosmanak
Copy link
Contributor

@dosmanak dosmanak commented Jan 6, 2022

FIx conflict after mergify action.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 6, 2022
@botelastic
Copy link

botelastic bot commented Jan 6, 2022

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

❕ Build Aborted

The PR is not allowed to run in the CI yet

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Reason: The PR is not allowed to run in the CI yet

  • Start Time: 2022-01-06T10:06:28.368+0000

  • Duration: 5 min 55 sec

  • Commit: f7c45cd

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@dosmanak dosmanak mentioned this pull request Jan 6, 2022
Merged
@dedemorton
Copy link
Contributor

Thanks! No worries about the merge conflict. These are expected with our autobackporting tool. :-) Thanks for fixing this.

dedemorton
dedemorton approved these changes Jan 6, 2022
View reviewed changes
Copy link
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dedemorton dedemorton merged commit cbed558 into elastic:mergify/bp/8.0/pr-29443 Jan 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dedemorton dedemorton dedemorton approved these changes

Assignees
No one assigned
Labels
needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dosmanak @elasticmachine @dedemorton