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

refactor(osmoutils): remove redundant ctx param from DeleteAllKeysFromPrefix (backport #6510) #6514

Merged
merged 3 commits into from
Sep 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 24, 2023

This is an automatic backport of pull request #6510 done by Mergify.
Cherry-pick of 540c8c9 has failed:

On branch mergify/bp/v19.x/pr-6510
Your branch is up to date with 'origin/v19.x'.

You are currently cherry-picking commit 540c8c98.
  (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:   CHANGELOG.md
	modified:   osmoutils/go.mod
	modified:   osmoutils/store_helper.go
	modified:   x/gamm/keeper/migrate.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmoutils/go.sum
	both modified:   tests/cl-genesis-positions/go.mod
	both modified:   tests/cl-genesis-positions/go.sum
	both modified:   tests/cl-go-client/go.mod
	both modified:   tests/cl-go-client/go.sum
	both modified:   x/epochs/go.mod
	both modified:   x/epochs/go.sum
	both modified:   x/ibc-hooks/go.mod
	both modified:   x/ibc-hooks/go.sum

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

@mergify mergify bot added the conflicts label Sep 24, 2023
@mergify mergify bot assigned p0mvn Sep 24, 2023
@github-actions github-actions bot added C:x/gamm Changes, features and bugs related to the gamm module. C:x/epochs labels Sep 24, 2023
@p0mvn p0mvn merged commit cbd8079 into v19.x Sep 26, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v19.x/pr-6510 branch September 26, 2023 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/gamm Changes, features and bugs related to the gamm module. conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant