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

e2e: abci protocol should be consistent across networks (backport #7078) #7085

Merged
merged 2 commits into from Oct 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 8, 2021

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

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

You are currently cherry-picking commit f2a8f5e05.
  (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/generator/generate.go
	both modified:   test/e2e/pkg/manifest.go
	both modified:   test/e2e/pkg/testnet.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.io/

It seems weird in retrospect that we allow networks to contain
applications that use different ABCI protocols.

(cherry picked from commit f2a8f5e)

# Conflicts:
#	test/e2e/generator/generate.go
#	test/e2e/pkg/manifest.go
#	test/e2e/pkg/testnet.go
@tychoish tychoish added S:automerge Automatically merge PR when requirements pass and removed conflicts labels Oct 8, 2021
@tychoish tychoish merged commit 9f13b9b into v0.34.x Oct 8, 2021
@tychoish tychoish deleted the mergify/bp/v0.34.x/pr-7078 branch October 8, 2021 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S:automerge Automatically merge PR when requirements pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant