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

Bump Cosmos SDK to v0.42.2 (bp #771) #773

Merged
merged 1 commit into from
Mar 19, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 19, 2021

This is an automatic backport of pull request #771 done by Mergify.

Cherry-pick of 477b739 has failed:

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

You are currently cherry-picking commit 477b739.
  (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:   CHANGELOG.md

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

@codecov
Copy link

codecov bot commented Mar 19, 2021

Codecov Report

❗ No coverage uploaded for pull request base (release/v4.1.x@979758d). Click here to learn what that means.
The diff coverage is n/a.

@@                Coverage Diff                @@
##             release/v4.1.x     #773   +/-   ##
=================================================
  Coverage                  ?   12.39%           
=================================================
  Files                     ?        8           
  Lines                     ?      694           
  Branches                  ?        0           
=================================================
  Hits                      ?       86           
  Misses                    ?      590           
  Partials                  ?       18           

@alessio
Copy link
Contributor

alessio commented Mar 19, 2021

I've fixed the conflicts @shahankhatch, this looks good to go

@alessio alessio removed the conflicts label Mar 19, 2021
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 477b739)
@alessio alessio force-pushed the mergify/bp/release/v4.1.x/pr-771 branch from 6918980 to a5ad045 Compare March 19, 2021 16:50
@shahankhatch shahankhatch merged commit 0c63d8b into release/v4.1.x Mar 19, 2021
@shahankhatch shahankhatch deleted the mergify/bp/release/v4.1.x/pr-771 branch March 19, 2021 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants