Skip to content

fix: add cosmos_proto.implements_interface (backport #1740)#1811

Merged
crodriguezvega merged 2 commits intorelease/v2.1.xfrom
mergify/bp/release/v2.1.x/pr-1740
Jul 29, 2022
Merged

fix: add cosmos_proto.implements_interface (backport #1740)#1811
crodriguezvega merged 2 commits intorelease/v2.1.xfrom
mergify/bp/release/v2.1.x/pr-1740

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 28, 2022

This is an automatic backport of pull request #1740 done by Mergify.
Cherry-pick of 40d0ff7 has failed:

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

You are currently cherry-picking commit 40d0ff7.
  (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:   proto/ibc/core/client/v1/client.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   modules/core/02-client/types/client.pb.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

* fix: add cosmos_proto.implements_interface

* changelog

* Update CHANGELOG.md

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* run `make proto-all`

* run `go mod tidy`

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
(cherry picked from commit 40d0ff7)

# Conflicts:
#	CHANGELOG.md
#	modules/core/02-client/types/client.pb.go
@crodriguezvega crodriguezvega merged commit 790a2e7 into release/v2.1.x Jul 29, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v2.1.x/pr-1740 branch July 29, 2022 12:34
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