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

Rename Order to Ordering for MsgRegisterInterchainAccount. (backport #5674) #5681

Merged
merged 3 commits into from
Jan 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 22, 2024

This is an automatic backport of pull request #5674 done by Mergify.
Cherry-pick of 61e3eb5 has failed:

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

You are currently cherry-picking commit 61e3eb59.
  (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:   modules/apps/27-interchain-accounts/controller/client/cli/tx.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/account.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
	modified:   modules/apps/27-interchain-accounts/controller/types/tx.pb.go
	modified:   proto/ibc/applications/interchain_accounts/controller/v1/tx.proto

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/docs/02-apps/02-interchain-accounts/05-messages.md
	both modified:   modules/apps/27-interchain-accounts/controller/types/msgs.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

* nit: Rename Order to Ordering for MsgRegisterInterchainAccount.

To align with name used in channel proto types w.r.t order.

* update docs

---------

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

# Conflicts:
#	docs/docs/02-apps/02-interchain-accounts/05-messages.md
#	modules/apps/27-interchain-accounts/controller/types/msgs.go
Fix conflict in msgs.go for controller.
Rename order -> ordering in any new places introduced for backwards compatible API.
@DimitrisJim DimitrisJim removed their assignment Jan 22, 2024
@damiannolan damiannolan enabled auto-merge (squash) January 22, 2024 14:09
@damiannolan damiannolan merged commit 2e3f92e into release/v8.1.x Jan 22, 2024
18 of 19 checks passed
@damiannolan damiannolan deleted the mergify/bp/release/v8.1.x/pr-5674 branch January 22, 2024 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants