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

Add unlocking lock id to BeginUnlocking response (backport #4489) #4495

Merged
merged 1 commit into from
Mar 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 3, 2023

This is an automatic backport of pull request #4489 done by Mergify.
Cherry-pick of d5f8210 has failed:

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

You are currently cherry-picking commit d5f8210a.
  (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:   proto/osmosis/lockup/tx.proto
	modified:   x/lockup/keeper/iterator.go
	modified:   x/lockup/keeper/lock.go
	modified:   x/lockup/keeper/lock_test.go
	modified:   x/lockup/keeper/msg_server.go
	modified:   x/lockup/keeper/msg_server_test.go
	modified:   x/lockup/types/tx.pb.go
	modified:   x/superfluid/keeper/edge_case_test.go
	modified:   x/superfluid/keeper/unpool_test.go
	modified:   x/valset-pref/keeper_test.go
	modified:   x/valset-pref/types/expected_interfaces.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x/superfluid/keeper/migrate_test.go

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

@p0mvn p0mvn merged commit 3ffb10f into v15.x Mar 3, 2023
@p0mvn p0mvn deleted the mergify/bp/v15.x/pr-4489 branch March 3, 2023 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants