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

fix: missing tx flags for update and misbehaviour commands in client (backport #2171) #2198

Merged
merged 2 commits into from
Sep 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 6, 2022

This is an automatic backport of pull request #2171 done by Mergify.
Cherry-pick of 4adc069 has failed:

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

You are currently cherry-picking commit 4adc069.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/core/02-client/client/cli/tx.go

no changes added to commit (use "git add" and/or "git commit -a")

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

…2171)

(cherry picked from commit 4adc069)

# Conflicts:
#	modules/core/02-client/client/cli/tx.go
@lgtm-com
Copy link

lgtm-com bot commented Sep 6, 2022

This pull request introduces 2 alerts when merging 75ceafe into 72cb685 - view on LGTM.com

new alerts:

  • 2 for Unreachable statement

Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @crodriguezvega for fixing the merge conflicts!

@crodriguezvega crodriguezvega merged commit 8de9eab into release/v5.1.x Sep 7, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v5.1.x/pr-2171 branch September 7, 2022 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants