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

feat: extended app hash logs (backport #7253) #7278

Merged
merged 2 commits into from
Jan 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2024

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

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

You are currently cherry-picking commit ae036e8f.
  (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
	both modified:   osmomath/go.mod
	both modified:   osmomath/go.sum
	both modified:   osmoutils/go.mod
	both modified:   osmoutils/go.sum
	both modified:   x/epochs/go.mod
	both modified:   x/epochs/go.sum
	both modified:   x/ibc-hooks/go.mod
	both modified:   x/ibc-hooks/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

* app hash logs

* changelog entry

* Auto: update go.mod after push to adam/app-hash-logs that modified dependencies locally

* add back replace

* Auto: update go.mod after push to adam/app-hash-logs that modified dependencies locally

* fix changelog

* remove extra line

---------

Co-authored-by: github-actions <[email protected]>
(cherry picked from commit ae036e8)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
#	osmomath/go.mod
#	osmomath/go.sum
#	osmoutils/go.mod
#	osmoutils/go.sum
#	x/epochs/go.mod
#	x/epochs/go.sum
#	x/ibc-hooks/go.mod
#	x/ibc-hooks/go.sum
@czarcas7ic czarcas7ic merged commit 219cee2 into v21.x Jan 9, 2024
1 check passed
@czarcas7ic czarcas7ic deleted the mergify/bp/v21.x/pr-7253 branch January 9, 2024 04:27
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