Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Merged
merged 2 commits into from
Jul 29, 2022

Conversation

mergify[bot]
Copy link
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/v3.1.x/pr-1740
Your branch is up to date with 'origin/release/v3.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 1b9191e into release/v3.1.x Jul 29, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v3.1.x/pr-1740 branch July 29, 2022 12:35
ellie4x pushed a commit to Carina-labs/ibc-go that referenced this pull request Sep 14, 2022
…smos#1816)

* fix: add cosmos_proto.implements_interface (cosmos#1740)

* 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

* fix conflicts

Co-authored-by: Dan Lynch <pyramation@gmail.com>
Co-authored-by: crodriguezvega <carlos@interchain.io>
dudong2 pushed a commit to dudong2/ibc-go that referenced this pull request Jan 19, 2023
…smos#1816)

* fix: add cosmos_proto.implements_interface (cosmos#1740)

* 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)

* fix conflicts

Co-authored-by: Dan Lynch <pyramation@gmail.com>
Co-authored-by: crodriguezvega <carlos@interchain.io>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants