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

[BP: release/v5 <- #86] fix!: queries that panic should return ack-err #138

Merged
merged 2 commits into from
Nov 8, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 7, 2023

This is an automatic backport of pull request #86 done by Mergify.
Cherry-pick of 83f866e has failed:

On branch mergify/bp/release/v5/pr-86
Your branch is up to date with 'origin/release/v5'.

You are currently cherry-picking commit 83f866e.
  (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:   modules/async-icq/README.md
	new file:   modules/async-icq/keeper/cache_ctx.go
	modified:   modules/async-icq/keeper/relay.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   modules/async-icq/testing/demo-simapp/app/export.go

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

* adding ApplyFuncIfNoError

* Moving cache_ctx.go to the keeper

* updating comment

* chore: address linter errors

---------

Co-authored-by: jtieri <[email protected]>
(cherry picked from commit 83f866e)

# Conflicts:
#	modules/async-icq/testing/demo-simapp/app/export.go
@jtieri jtieri enabled auto-merge (squash) November 8, 2023 22:55
@jtieri jtieri merged commit 16e0000 into release/v5 Nov 8, 2023
4 checks passed
@jtieri jtieri deleted the mergify/bp/release/v5/pr-86 branch November 8, 2023 22:56
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