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(client/v2): support consensus address decoding (backport #16927) #16997

Merged
merged 4 commits into from
Jul 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2023

This is an automatic backport of pull request #16927 done by Mergify.
Cherry-pick of 90b3907 has failed:

On branch mergify/bp/release/v0.50.x/pr-16927
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 90b390795.
  (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:   client/v2/autocli/app.go
	modified:   client/v2/autocli/builder.go
	modified:   client/v2/autocli/common_test.go
	modified:   client/v2/autocli/flag/address.go
	modified:   client/v2/autocli/flag/builder.go
	modified:   client/v2/autocli/query_test.go
	modified:   client/v2/autocli/testdata/help-deprecated.golden
	modified:   client/v2/autocli/testdata/help-echo.golden
	modified:   client/v2/internal/testpb/query.proto
	modified:   client/v2/internal/testpb/query.pulsar.go
	modified:   simapp/app.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/v2/go.mod
	both modified:   client/v2/go.sum
	both modified:   tools/hubl/go.mod
	both modified:   tools/hubl/go.sum
	both modified:   tools/hubl/internal/remote.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

(cherry picked from commit 90b3907)

# Conflicts:
#	client/v2/go.mod
#	client/v2/go.sum
#	tools/hubl/go.mod
#	tools/hubl/go.sum
#	tools/hubl/internal/remote.go
@mergify mergify bot requested a review from a team as a code owner July 14, 2023 08:12
@mergify mergify bot added the conflicts label Jul 14, 2023
@github-actions github-actions bot added C:CLI C:Hubl Tool: Hubl labels Jul 14, 2023
@github-actions
Copy link
Contributor

@mergify[bot] your pull request is missing a changelog!

@julienrbrt julienrbrt merged commit 1018f53 into release/v0.50.x Jul 14, 2023
47 of 48 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16927 branch July 14, 2023 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:Hubl Tool: Hubl
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant