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

fix(testing): use the correct revision height when querying trusted validator set (backport #4483) #4506

Merged
merged 2 commits into from
Aug 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2023

This is an automatic backport of pull request #4483 done by Mergify.
Cherry-pick of 4e0bea7 has failed:

On branch mergify/bp/release/v7.3.x/pr-4483
Your branch is up to date with 'origin/release/v7.3.x'.

You are currently cherry-picking commit 4e0bea72.
  (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:   testing/chain.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

…set in testingpkg (#4483)

(cherry picked from commit 4e0bea7)

# Conflicts:
#	testing/chain.go
Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @crodriguezvega ❤️

@colin-axner colin-axner merged commit 08c969a into release/v7.3.x Aug 30, 2023
15 checks passed
@colin-axner colin-axner deleted the mergify/bp/release/v7.3.x/pr-4483 branch August 30, 2023 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants