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: Cap Initialization Fix (forward-port #9392) #9805

Merged
merged 2 commits into from
Jul 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2021

This PR is a forward-port of #9392 from release/v0.42.x to release/v0.43.x.

It was initially decided in #9392 (comment) that #9392 would be a temporary fix for 0.42, but as per @AdityaSripal's request we're actually foward-porting this to release/v0.43.x too.

Mergify description:

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

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

You are currently cherry-picking commit 3776793ce.
  (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/bank/simulation/params.go
	modified:   x/capability/keeper/keeper.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x/ibc/applications/transfer/simulation/params.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.io/

(cherry picked from commit 3776793)

# Conflicts:
#	x/ibc/applications/transfer/simulation/params.go
@mergify mergify bot added the conflicts label Jul 28, 2021
@mergify mergify bot mentioned this pull request Jul 28, 2021
9 tasks
@orijbot
Copy link

orijbot commented Jul 28, 2021

Visit https://dashboard.github.orijtech.com?pr=9805&repo=cosmos%2Fcosmos-sdk to see benchmark details.

@amaury1093 amaury1093 changed the title Cap Initialization Fix (backport #9392) fix: Cap Initialization Fix (backport #9392) Jul 28, 2021
@amaury1093 amaury1093 changed the title fix: Cap Initialization Fix (backport #9392) fix: Cap Initialization Fix (forward-port #9392) Jul 28, 2021
@amaury1093 amaury1093 merged commit c6d03f7 into release/v0.43.x Jul 28, 2021
@amaury1093 amaury1093 deleted the mergify/bp/release/v0.43.x/pr-9392 branch July 28, 2021 13:08
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Oct 12, 2021
* x/capability: Cap Initialization Fix (cosmos#9392)

(cherry picked from commit 3776793)

# Conflicts:
#	x/ibc/applications/transfer/simulation/params.go

* remove ibc file

Co-authored-by: Aditya <adityasripal@gmail.com>
Co-authored-by: Amaury M <1293565+amaurym@users.noreply.github.com>
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Nov 1, 2021
* x/capability: Cap Initialization Fix (cosmos#9392)

(cherry picked from commit 3776793)

# Conflicts:
#	x/ibc/applications/transfer/simulation/params.go

* remove ibc file

Co-authored-by: Aditya <adityasripal@gmail.com>
Co-authored-by: Amaury M <1293565+amaurym@users.noreply.github.com>
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.

5 participants