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

chore: bump tokio-util from 0.6.9 to 0.7.1 (backport #213) #214

Open
wants to merge 1 commit into
base: v1.9
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 20, 2022

This is an automatic backport of pull request #213 done by Mergify.
Cherry-pick of 0d773bd has failed:

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

You are currently cherry-picking commit 0d773bd13.
  (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:   rpc/Cargo.toml
	modified:   web3.js/package-lock.json
	modified:   web3.js/package.json
	modified:   web3.js/yarn.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   accounts-bench/Cargo.toml
	both modified:   accounts-cluster-bench/Cargo.toml
	both modified:   banking-bench/Cargo.toml
	both modified:   bench-tps/Cargo.toml
	both modified:   bloom/Cargo.toml
	both modified:   clap-utils/Cargo.toml
	both modified:   cli/Cargo.toml
	both modified:   client/Cargo.toml
	both modified:   core/Cargo.toml
	both modified:   dos/Cargo.toml
	both modified:   entry/Cargo.toml
	both modified:   faucet/Cargo.toml
	both modified:   genesis/Cargo.toml
	both modified:   gossip/Cargo.toml
	both modified:   ledger-tool/Cargo.toml
	both modified:   local-cluster/Cargo.toml
	both modified:   merkle-root-bench/Cargo.toml
	both modified:   metrics/Cargo.toml
	both modified:   net-shaper/Cargo.toml
	both modified:   net-utils/Cargo.toml
	both modified:   perf/Cargo.toml
	both modified:   poh-bench/Cargo.toml
	both modified:   poh/Cargo.toml
	both modified:   programs/bpf_loader/Cargo.toml
	both modified:   programs/ed25519-tests/Cargo.toml
	both modified:   rbpf-cli/Cargo.toml
	both modified:   runtime/store-tool/Cargo.toml
	both modified:   sdk/cargo-build-bpf/Cargo.toml
	both modified:   sdk/cargo-test-bpf/Cargo.toml
	both modified:   stake-accounts/Cargo.toml
	both modified:   sys-tuner/Cargo.toml
	both modified:   transaction-dos/Cargo.toml
	both modified:   validator/Cargo.toml
	both modified:   watchtower/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

* chore: bump clap from 2.33.3 to 3.1.8 (#206)

Bumps [clap](https://github.com/clap-rs/clap) from 2.33.3 to 3.1.8.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](clap-rs/clap@v2.33.3...v3.1.8)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: bump rand from 0.7.3 to 0.8.5 (#205)

Bumps [rand](https://github.com/rust-random/rand) from 0.7.3 to 0.8.5.
- [Release notes](https://github.com/rust-random/rand/releases)
- [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md)
- [Commits](rust-random/rand@0.7.3...0.8.5)

---
updated-dependencies:
- dependency-name: rand
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: bump eslint-plugin-import from 2.25.3 to 2.26.0 in /web3.js (#209)

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.3 to 2.26.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](import-js/eslint-plugin-import@v2.25.3...v2.26.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: bump tokio-util from 0.6.9 to 0.7.1

Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.6.9 to 0.7.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-util-0.6.9...tokio-util-0.7.1)

---
updated-dependencies:
- dependency-name: tokio-util
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 0d773bd)

# Conflicts:
#	Cargo.lock
#	accounts-bench/Cargo.toml
#	accounts-cluster-bench/Cargo.toml
#	banking-bench/Cargo.toml
#	bench-tps/Cargo.toml
#	bloom/Cargo.toml
#	clap-utils/Cargo.toml
#	cli/Cargo.toml
#	client/Cargo.toml
#	core/Cargo.toml
#	dos/Cargo.toml
#	entry/Cargo.toml
#	faucet/Cargo.toml
#	genesis/Cargo.toml
#	gossip/Cargo.toml
#	ledger-tool/Cargo.toml
#	local-cluster/Cargo.toml
#	merkle-root-bench/Cargo.toml
#	metrics/Cargo.toml
#	net-shaper/Cargo.toml
#	net-utils/Cargo.toml
#	perf/Cargo.toml
#	poh-bench/Cargo.toml
#	poh/Cargo.toml
#	programs/bpf_loader/Cargo.toml
#	programs/ed25519-tests/Cargo.toml
#	rbpf-cli/Cargo.toml
#	runtime/store-tool/Cargo.toml
#	sdk/cargo-build-bpf/Cargo.toml
#	sdk/cargo-test-bpf/Cargo.toml
#	stake-accounts/Cargo.toml
#	sys-tuner/Cargo.toml
#	transaction-dos/Cargo.toml
#	validator/Cargo.toml
#	watchtower/Cargo.toml
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