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

feat: adding connection params grpc and cli query (backport #2745) #2783

Merged
merged 3 commits into from
Nov 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 17, 2022

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

On branch mergify/bp/release/v6.0.x/pr-2745
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit a05247c.
  (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/client/swagger-ui/swagger.yaml
	modified:   modules/core/02-client/client/cli/cli.go
	modified:   modules/core/02-client/client/cli/query.go
	modified:   modules/core/02-client/keeper/grpc_query.go
	modified:   modules/core/02-client/keeper/grpc_query_test.go
	modified:   modules/core/02-client/types/query.pb.go
	modified:   modules/core/03-connection/client/cli/cli.go
	modified:   modules/core/03-connection/client/cli/query.go
	modified:   modules/core/03-connection/keeper/grpc_query.go
	modified:   modules/core/03-connection/keeper/grpc_query_test.go
	modified:   modules/core/03-connection/types/query.pb.go
	modified:   modules/core/keeper/grpc_query.go
	modified:   proto/ibc/core/client/v1/query.proto
	modified:   proto/ibc/core/connection/v1/query.proto

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

imp: (core/03-connection) Adding `ConnectionParams` grpc query and CLI to 03-connection.
fix: (modules/core/keeper) Fix request wiring for `UpgradedConsensusState` in core query server.
(cherry picked from commit a05247c)

# Conflicts:
#	CHANGELOG.md
#	modules/core/02-client/types/query.pb.gw.go
#	modules/core/03-connection/types/query.pb.gw.go
@damiannolan damiannolan removed their assignment Nov 17, 2022
@colin-axner colin-axner merged commit 49df14b into release/v6.0.x Nov 21, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v6.0.x/pr-2745 branch November 21, 2022 12:21
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.

2 participants