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: changelog update (backport #12859) #12862

Merged
merged 2 commits into from
Aug 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2022

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

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

You are currently cherry-picking commit e2d6cbdeb.
  (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:   x/auth/ante/fee.go
	both modified:   x/auth/tx/service_test.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

* updates

* updates

* updates

Co-authored-by: Marko <[email protected]>
(cherry picked from commit e2d6cbd)

# Conflicts:
#	CHANGELOG.md
#	x/auth/ante/fee.go
#	x/auth/tx/service_test.go
@mergify mergify bot requested review from aaronc and alexanderbez as code owners August 8, 2022 20:10
@mergify mergify bot added the conflicts label Aug 8, 2022
@alexanderbez alexanderbez merged commit b09fc03 into release/v0.45.x Aug 8, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.45.x/pr-12859 branch August 8, 2022 21:23
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
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