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

Update to rayon 1.4.0 (bp #11898) #11959

Merged
merged 2 commits into from
Sep 1, 2020
Merged

Update to rayon 1.4.0 (bp #11898) #11959

merged 2 commits into from
Sep 1, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 31, 2020

This is an automated backport of pull request #11898 done by Mergify

Cherry-pick of c4253dc has failed:

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

You are currently cherry-picking commit c4253dc0f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   Cargo.lock
	modified:   programs/bpf/Cargo.lock

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	both modified:   accounts-bench/Cargo.toml
	both modified:   banking-bench/Cargo.toml
	both modified:   bench-exchange/Cargo.toml
	both modified:   bench-tps/Cargo.toml
	both modified:   client/Cargo.toml
	both modified:   core/Cargo.toml
	both modified:   dos/Cargo.toml
	both modified:   ledger/Cargo.toml
	both modified:   perf/Cargo.toml
	deleted by us:   poh-bench/Cargo.toml
	both modified:   runtime/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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 simulator.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit c4253dc)

# Conflicts:
#	accounts-bench/Cargo.toml
#	banking-bench/Cargo.toml
#	bench-exchange/Cargo.toml
#	bench-tps/Cargo.toml
#	client/Cargo.toml
#	core/Cargo.toml
#	dos/Cargo.toml
#	ledger/Cargo.toml
#	perf/Cargo.toml
#	poh-bench/Cargo.toml
#	runtime/Cargo.toml
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 31, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 31, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 31, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2020
@carllin carllin merged commit b34f179 into v1.2 Sep 1, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-11898 branch September 1, 2020 03:39
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.

2 participants