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

chore!: bump the cosmos-sdk to include new vesting module changes (backport #2397) #2399

Merged
merged 3 commits into from
Aug 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 31, 2023

This is an automatic backport of pull request #2397 done by Mergify.
Cherry-pick of 1b4e884 has failed:

On branch mergify/bp/v1.x/pr-2397
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 1b4e884.
  (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:   app/test/std_sdk_test.go
	modified:   go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum

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

)

## Overview

bumps the sdk to include the latest changes to the vesting module

(cherry picked from commit 1b4e884)

# Conflicts:
#	go.sum
@rootulp rootulp enabled auto-merge (squash) August 31, 2023 16:52
@github-actions github-actions bot added the bot item was created by a bot label Aug 31, 2023
@celestia-bot celestia-bot requested a review from a team August 31, 2023 16:54
@rootulp rootulp merged commit ab89633 into v1.x Aug 31, 2023
20 of 21 checks passed
@rootulp rootulp deleted the mergify/bp/v1.x/pr-2397 branch August 31, 2023 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants