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 missed merge-conflicts #468

Merged
merged 1 commit into from
Jun 21, 2021
Merged

fix: resolve missed merge-conflicts #468

merged 1 commit into from
Jun 21, 2021

Conversation

mdelapenya
Copy link
Contributor

What does this PR do?

It resolves conflicts added in 7c29697

Why is it important?

Keep branch healthy

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@mdelapenya mdelapenya self-assigned this Jun 18, 2021
@mdelapenya mdelapenya requested review from a team and michel-laterman June 18, 2021 14:31
@mdelapenya mdelapenya marked this pull request as ready for review June 18, 2021 14:31
@elasticmachine
Copy link
Contributor

elasticmachine commented Jun 18, 2021 •
edited
Loading

💚 Build Succeeded

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

  • Build Cause: Branch indexing

  • Start Time: 2021-06-18T22:28:32.261+0000

  • Duration: 5 min 18 sec

  • Commit: 4ca031b

Test stats 🧪

Test Results
Failed 0
Passed 178
Skipped 0
Total 178

Trends 🧪

Image of Build Times

Image of Tests

blakerouse
blakerouse approved these changes Jun 21, 2021
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Looks good.

@mdelapenya mdelapenya merged commit f438876 into elastic:7.x Jun 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cachedout cachedout cachedout approved these changes

@blakerouse blakerouse blakerouse approved these changes

@michel-laterman michel-laterman Awaiting requested review from michel-laterman

Assignees

@mdelapenya mdelapenya

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mdelapenya @elasticmachine @cachedout @blakerouse