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.14](backport #5061) Updated es infra processor and dependabot rules to include further up… #5063

Merged
merged 2 commits into from
Jul 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 4, 2024


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

#5061)

* updated es infra processor and dependabot rules to include further updates

* updated es infra processor and dependabot rules to include further updates

(cherry picked from commit 1063e80)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
@mergify mergify bot requested a review from a team as a code owner July 4, 2024 19:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 4, 2024
@mergify mergify bot requested review from michalpristas and michel-laterman and removed request for a team July 4, 2024 19:25
Copy link
Contributor Author

mergify bot commented Jul 4, 2024

Cherry-pick of 1063e80 has failed:

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

You are currently cherry-picking commit 1063e802d9.
  (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)

Changes to be committed:
	modified:   .github/dependabot.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md

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

@michalpristas michalpristas enabled auto-merge (squash) July 4, 2024 19:43
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@michalpristas michalpristas merged commit e93f3da into 8.14 Jul 5, 2024
13 checks passed
@michalpristas michalpristas deleted the mergify/bp/8.14/pr-5061 branch July 5, 2024 05:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant