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

Update CLI to recover expired client for SDK 46 updates to gov module (backport #2301) #2359

Merged
merged 3 commits into from
Sep 26, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 21, 2022

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

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

You are currently cherry-picking commit daac435.
  (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:   docs/ibc/proposals.md

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

…#2301)

* Update CLI commands to recover expired client for SDK 46 updates to gov module

* Fix alignment

* Add proposal json, fix alginment

* Apply suggestions from code review

Co-authored-by: Carlos Rodriguez <[email protected]>

Co-authored-by: Carlos Rodriguez <[email protected]>
(cherry picked from commit daac435)

# Conflicts:
#	docs/ibc/proposals.md
docs/ibc/proposals.md Outdated Show resolved Hide resolved
@colin-axner colin-axner merged commit 1313dc9 into release/v5.0.x Sep 26, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v5.0.x/pr-2301 branch September 26, 2022 16:01
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.

3 participants