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

Update IBC to emit errors as events (backport #7400) #7467

Merged
merged 2 commits into from
Feb 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2024

This is an automatic backport of pull request #7400 done by Mergify.
Cherry-pick of 6705b46 has failed:

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

You are currently cherry-picking commit 6705b469.
  (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
	modified:   tests/ibc-hooks/ibc_middleware_test.go
	modified:   x/epochs/go.mod
	modified:   x/ibc-hooks/go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmoutils/go.mod
	both modified:   osmoutils/go.sum
	both modified:   x/epochs/go.sum
	both modified:   x/ibc-hooks/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

@mergify mergify bot requested a review from mattverse as a code owner February 12, 2024 04:21
@mergify mergify bot added the conflicts label Feb 12, 2024
@mergify mergify bot requested a review from nicolaslara as a code owner February 12, 2024 04:21
@p0mvn p0mvn force-pushed the mergify/bp/v23.x/pr-7400 branch 2 times, most recently from 95c8c64 to 53bb33a Compare February 12, 2024 04:27
@p0mvn p0mvn force-pushed the mergify/bp/v23.x/pr-7400 branch from 53bb33a to 35733fe Compare February 12, 2024 04:28
@p0mvn p0mvn merged commit bb7b962 into v23.x Feb 12, 2024
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v23.x/pr-7400 branch February 12, 2024 05:12
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.

2 participants