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

Add abci_info implementation (backport #60) #67

Merged
merged 30 commits into from
Oct 4, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 4, 2023

This is an automatic backport of pull request #60 done by Mergify.
Cherry-pick of 149d676 has failed:

On branch mergify/bp/v0.34.x/pr-60
Your branch is ahead of 'origin/v0.34.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 149d676.
  (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:
	new file:   e2e-tests/main_test.go
	modified:   go_rly_consumer.json
	modified:   go_rly_provider.json
	deleted:    local-testnet-singlechain.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e-tests/local-testnet-debug.sh
	both modified:   e2e-tests/local-testnet-singlechain.sh
	deleted by us:   e2e-tests/local-testnet.sh

Cherry-pick of a47fd11 has failed:

On branch mergify/bp/v0.34.x/pr-60
Your branch is ahead of 'origin/v0.34.x' by 22 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a47fd11.
  (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:   e2e-tests/local-testnet-singlechain.sh

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 6e960a1)
(cherry picked from commit 149d676)

# Conflicts:
#	e2e-tests/local-testnet-debug.sh
#	e2e-tests/local-testnet-singlechain.sh
#	e2e-tests/local-testnet.sh
(cherry picked from commit e8b6cf7)
(cherry picked from commit cd62bb4)
(cherry picked from commit 372fd8b)
(cherry picked from commit 33514af)
(cherry picked from commit 3d2b20c)
(cherry picked from commit 414fd36)
(cherry picked from commit 547d2f1)
(cherry picked from commit 06e4493)
(cherry picked from commit 555b06a)
(cherry picked from commit 017b2ba)
(cherry picked from commit d4be15f)
(cherry picked from commit cb8fcb4)
(cherry picked from commit faa7880)
(cherry picked from commit a47fd11)

# Conflicts:
#	e2e-tests/local-testnet-singlechain.sh
@p-offtermatt p-offtermatt merged commit 0346040 into v0.34.x Oct 4, 2023
2 checks passed
@mergify mergify bot deleted the mergify/bp/v0.34.x/pr-60 branch October 4, 2023 11:36
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