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

[8.15](backport #41128) [Heartbeat] Fix linting issues introduced by auto-merge #41077 #41133

Merged
merged 5 commits into from
Oct 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 4, 2024

Proposed commit message

Fix linting issues introduced by auto-merge of #41077.

Checklist

  • [x ] 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.

This is an automatic backport of pull request #41128 done by [Mergify](https://mergify.com).

(cherry picked from commit efb563c)

# Conflicts:
#	heartbeat/monitors/monitor.go
#	heartbeat/monitors/monitor_test.go
@mergify mergify bot requested a review from a team as a code owner October 4, 2024 19:09
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 4, 2024
Copy link
Contributor Author

mergify bot commented Oct 4, 2024

Cherry-pick of efb563c has failed:

On branch mergify/bp/8.15/pr-41128
Your branch is up to date with 'origin/8.15'.

You are currently cherry-picking commit efb563c890.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   heartbeat/monitors/monitor.go
	both modified:   heartbeat/monitors/monitor_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 4, 2024
@emilioalvap emilioalvap added Team:obs-ds-hosted-services Label for the Observability Hosted Services team and removed needs_team Indicates that the issue/PR needs a Team:* label conflicts There is a conflict in the backported pull request labels Oct 4, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

Copy link
Contributor Author

mergify bot commented Oct 7, 2024

This pull request has not been merged yet. Could you please review and merge it @emilioalvap? 🙏

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@emilioalvap emilioalvap enabled auto-merge (squash) October 10, 2024 11:07
@emilioalvap emilioalvap merged commit 1e33939 into 8.15 Oct 10, 2024
29 checks passed
@emilioalvap emilioalvap deleted the mergify/bp/8.15/pr-41128 branch October 10, 2024 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:obs-ds-hosted-services Label for the Observability Hosted Services team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants