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

cli: sort option for validators by version (backport #24233) #24237

Merged
merged 1 commit into from
Apr 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 11, 2022

This is an automatic backport of pull request #24233 done by Mergify.
Cherry-pick of 91993d8 has failed:

On branch mergify/bp/v1.10/pr-24233
Your branch is up to date with 'origin/v1.10'.

You are currently cherry-picking commit 91993d89b.
  (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:
	modified:   cli-output/src/cli_output.rs
	modified:   cli/src/cluster_query.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   cli-output/Cargo.toml
	both modified:   programs/bpf/Cargo.lock

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

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes conflicts and removed automerge Merge this Pull Request automatically once CI passes labels Apr 11, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Apr 11, 2022

automerge label removed due to a CI failure

(cherry picked from commit 91993d8)

# Conflicts:
#	Cargo.lock
#	cli-output/Cargo.toml
#	programs/bpf/Cargo.lock
@t-nelson t-nelson force-pushed the mergify/bp/v1.10/pr-24233 branch from 4cb3b29 to 96421fb Compare April 15, 2022 07:26
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 15, 2022
@mergify mergify bot merged commit 3bf00e4 into v1.10 Apr 15, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-24233 branch April 15, 2022 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant