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

(deps!): bump ICS to v2.3.0-provider-lsm (#2808) (backport #2809) #2810

Merged
merged 1 commit into from
Nov 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 10, 2023

This is an automatic backport of pull request #2809 done by Mergify.
Cherry-pick of 5f2b558 has failed:

On branch mergify/bp/release/v14.x/pr-2809
Your branch is up to date with 'origin/release/v14.x'.

You are currently cherry-picking commit 5f2b558.
  (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:   go.mod
	modified:   go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .changelog/v14.0.0/api-breaking/2781-bump-ics.md
	added by them:   .changelog/v14.0.0/api-breaking/2809-bump-ics.md
	deleted by them: .changelog/v14.0.0/dependencies/2781-bump-ics.md
	added by them:   .changelog/v14.0.0/dependencies/2809-bump-ics.md
	deleted by them: .changelog/v14.0.0/features/2781-bump-ics.md
	added by them:   .changelog/v14.0.0/features/2809-bump-ics.md
	deleted by them: .changelog/v14.0.0/state-breaking/2781-bump-ics.md
	added by them:   .changelog/v14.0.0/state-breaking/2809-bump-ics.md

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* bump ics

* update changelog entries

(cherry picked from commit 5f2b558)

# Conflicts:
#	.changelog/v14.0.0/api-breaking/2781-bump-ics.md
#	.changelog/v14.0.0/api-breaking/2809-bump-ics.md
#	.changelog/v14.0.0/dependencies/2781-bump-ics.md
#	.changelog/v14.0.0/dependencies/2809-bump-ics.md
#	.changelog/v14.0.0/features/2781-bump-ics.md
#	.changelog/v14.0.0/features/2809-bump-ics.md
#	.changelog/v14.0.0/state-breaking/2781-bump-ics.md
#	.changelog/v14.0.0/state-breaking/2809-bump-ics.md
@mergify mergify bot requested a review from alexanderbez as a code owner November 10, 2023 15:53
@mergify mergify bot added the conflicts label Nov 10, 2023
@mergify mergify bot assigned sainoe Nov 10, 2023
@sainoe sainoe merged commit 09249d7 into release/v14.x Nov 10, 2023
6 of 11 checks passed
@sainoe sainoe deleted the mergify/bp/release/v14.x/pr-2809 branch November 10, 2023 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant