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: update ledger-cosmos-go v0.13.1 to resolve signing error with cosmos ledger app 2.34.12 (backport #1770) #1771

Merged
merged 3 commits into from
Nov 17, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 17, 2023

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

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

You are currently cherry-picking commit 39146747.
  (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:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum

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

…smos ledger app 2.34.12 (#1770)

* Update ledger-cosmos-go v0.13.1 with cosmos fork update

* Bump cosmos-sdk v0.46.11-kava.2

* Update changelog

* Update cosmos-sdk tag v0.46.11-kava.3

Incorrect kava.2 tag

(cherry picked from commit 3914674)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
@mergify mergify bot added the conflicts label Nov 17, 2023
@drklee3 drklee3 merged commit b97aa51 into release/v0.24.x Nov 17, 2023
9 checks passed
@drklee3 drklee3 deleted the mergify/bp/release/v0.24.x/pr-1770 branch November 17, 2023 22: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.

1 participant