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

fix: fixed key in slashing bitmap migration (backport #18016) #18033

Merged
merged 2 commits into from
Oct 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2023

This is an automatic backport of pull request #18016 done by Mergify.
Cherry-pick of 4001e2b has failed:

On branch mergify/bp/release/v0.50.x/pr-18016
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 4001e2b6d.
  (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:   x/slashing/migrations/v4/keys.go
	modified:   x/slashing/migrations/v4/migrate_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.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

(cherry picked from commit 4001e2b)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner October 10, 2023 08:07
@mergify mergify bot added the conflicts label Oct 10, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) October 10, 2023 08:21
@julienrbrt julienrbrt merged commit 8ab33f5 into release/v0.50.x Oct 10, 2023
43 of 45 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-18016 branch October 10, 2023 08:24
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.

2 participants