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: deadlock when querying group members (backport #12342) #12381

Merged
merged 2 commits into from
Jun 30, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 28, 2022

This is an automatic backport of pull request #12342 done by Mergify.
Cherry-pick of 18306a1 has failed:

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

You are currently cherry-picking commit 18306a1a4.
  (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/group/internal/orm/indexer.go
	modified:   x/group/internal/orm/table.go
	modified:   x/group/internal/orm/types.go
	modified:   x/group/keeper/keeper_test.go

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

(cherry picked from commit 18306a1)

# Conflicts:
#	x/group/keeper/keeper.go
@mergify mergify bot requested a review from a team as a code owner June 28, 2022 17:56
@mergify mergify bot added the conflicts label Jun 28, 2022
x/group/keeper/keeper.go Fixed Show fixed Hide fixed
x/group/keeper/keeper.go Fixed Show fixed Hide fixed
@alexanderbez
Copy link
Contributor

@blushi do you think you could address the merge conflicts in x/group/keeper/keeper.go? We'll get this merged and then cut the last v0.46 RC.

cc @marbar3778

@blushi
Copy link
Contributor

blushi commented Jun 29, 2022

@blushi do you think you could address the merge conflicts in x/group/keeper/keeper.go? We'll get this merged and then cut the last v0.46 RC.

cc @marbar3778

on it

@alexanderbez alexanderbez merged commit 9921120 into release/v0.46.x Jun 30, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.46.x/pr-12342 branch June 30, 2022 11:27
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
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