Skip to content

rpc: fix check_tx cache problem (backport #9690)#9692

Merged
thanethomson merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9690
Nov 10, 2022
Merged

rpc: fix check_tx cache problem (backport #9690)#9692
thanethomson merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9690

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 9, 2022

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

On branch mergify/bp/v0.34.x/pr-9690
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit ffae184b6.
  (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:   rpc/core/routes.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

(cherry picked from commit ffae184)

# Conflicts:
#	rpc/core/routes.go
@mergify mergify bot requested a review from a team November 9, 2022 23:51
@mergify mergify bot added the conflicts label Nov 9, 2022
Signed-off-by: Thane Thomson <connect@thanethomson.com>
Signed-off-by: Thane Thomson <connect@thanethomson.com>
@thanethomson thanethomson merged commit 413f5f7 into v0.34.x Nov 10, 2022
@thanethomson thanethomson deleted the mergify/bp/v0.34.x/pr-9690 branch November 10, 2022 12:16
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