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

Unpin tokio for non-rpc crates (backport #26957) #26964

Merged
merged 2 commits into from
Aug 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 6, 2022

This is an automatic backport of pull request #26957 done by Mergify.
Cherry-pick of 66919e5 has failed:

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

You are currently cherry-picking commit 66919e5ad.
  (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:   faucet/Cargo.toml
	modified:   ledger/Cargo.toml
	modified:   program-test/Cargo.toml
	modified:   streamer/Cargo.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   banks-server/Cargo.toml
	both modified:   client/Cargo.toml
	both modified:   ledger-tool/Cargo.toml
	both modified:   net-utils/Cargo.toml
	both modified:   storage-bigtable/Cargo.toml
	both modified:   test-validator/Cargo.toml

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 66919e5)

# Conflicts:
#	banks-server/Cargo.toml
#	client/Cargo.toml
#	ledger-tool/Cargo.toml
#	net-utils/Cargo.toml
#	storage-bigtable/Cargo.toml
#	test-validator/Cargo.toml
@mergify mergify bot added the conflicts label Aug 6, 2022
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Aug 6, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Aug 6, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 6, 2022
@mergify mergify bot merged commit a2f51a6 into v1.10 Aug 6, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-26957 branch August 6, 2022 04:41
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