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

chore: adding IsMiddlewareEnabled to ActiveChannel genesis type (backport #2177) #2224

Merged
merged 2 commits into from
Sep 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 8, 2022

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

On branch mergify/bp/release/v5.1.x/pr-2177
Your branch is up to date with 'origin/release/v5.1.x'.

You are currently cherry-picking commit b836b7f.
  (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:   docs/ibc/proto-docs.md
	modified:   modules/apps/27-interchain-accounts/controller/keeper/genesis.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/genesis_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go
	modified:   modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
	modified:   proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto

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

…2177)

* adding IsMiddlewareEnabled flag to ActiveChannel genesis type

* correcting yaml tag

* adding changelog entry

* Update proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto

Co-authored-by: Carlos Rodriguez <[email protected]>

Co-authored-by: Carlos Rodriguez <[email protected]>
(cherry picked from commit b836b7f)

# Conflicts:
#	CHANGELOG.md
@colin-axner colin-axner enabled auto-merge (squash) September 8, 2022 13:07
@colin-axner colin-axner merged commit 64a996f into release/v5.1.x Sep 8, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v5.1.x/pr-2177 branch September 8, 2022 13:38
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