Skip to content

e2e: Remove extraneous abci_protocol params in CI test (backport #9896)#9901

Merged
thanethomson merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9896
Dec 16, 2022
Merged

e2e: Remove extraneous abci_protocol params in CI test (backport #9896)#9901
thanethomson merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9896

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2022

This is an automatic backport of pull request #9896 done by Mergify.
Cherry-pick of 82ec855 has failed:

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

You are currently cherry-picking commit 82ec855be.
  (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:   test/e2e/networks/ci.toml

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

Signed-off-by: Thane Thomson <connect@thanethomson.com>

Signed-off-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 82ec855)

# Conflicts:
#	test/e2e/networks/ci.toml
@mergify mergify bot requested a review from ebuchman as a code owner December 16, 2022 22:31
@mergify mergify bot requested a review from a team December 16, 2022 22:31
@mergify mergify bot requested review from adizere and lasarojc as code owners December 16, 2022 22:31
@mergify mergify bot added the conflicts label Dec 16, 2022
Signed-off-by: Thane Thomson <connect@thanethomson.com>
@thanethomson thanethomson merged commit cbfe970 into v0.34.x Dec 16, 2022
@thanethomson thanethomson deleted the mergify/bp/v0.34.x/pr-9896 branch December 16, 2022 23:23
@moul moul mentioned this pull request Mar 6, 2025
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